用户管理、个人积分 修改

src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java

@@ -19,7 +19,7 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
     * 分页查询 bPersonValue
      *
     */
-    @Select("select * from b_person_value where del_flag != 1 and flag = 1 and user_id = #{id} ORDER BY create_date desc")
+    @Select("select * from b_person_value where del_flag != 1 and flag = 1 and person_id = #{id} ORDER BY create_date desc")
     @ResultMap(value = "BaseResultMap" )
     List<BPersonValue> queryBPersonValues(@Param("id") String id);
 

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -10,6 +10,7 @@ import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dto.MyInfoDTO;
 import org.rcisoft.sys.user.dto.QueryMenuResDTO;
 import org.rcisoft.sys.user.dto.QuerySysUserDTO;
+import org.rcisoft.sys.user.dto.RoleDto;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
 import org.springframework.stereotype.Repository;
@@ -37,14 +38,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @ResultMap(value = "BaseResultMap")
     List<SysUser> queryUsers(QuerySysUserDTO dto);
 
-    @Select("<script>SELECT sr.r_name AS roleList  " +
+    @Select("<script>SELECT * " +
             "FROM s_user AS su " +
             "LEFT JOIN s_r_user_role AS ru ON su.business_id = ru.user_id " +
             "LEFT JOIN tm_admin_role AS sr ON ru.role_id = sr.r_id  " +
             "WHERE su.del_flag = 0  " +
             "and sr.r_status != 0 " +
             "AND su.business_id = #{businessId}</script>")
-    List<String> queryRoleByUserId(@Param("businessId") String businessId);
+    @ResultMap(value = "RoleDtoMap")
+    List<RoleDto> queryRoleByUserId(@Param("businessId") String businessId);
 
     @Select("<script>SELECT sr.r_id AS roleIdList  " +
             "FROM s_user AS su " +

src/main/java/org/rcisoft/sys/user/dto/RoleDto.java

+package org.rcisoft.sys.user.dto;
+
+import lombok.Data;
+
+@Data
+public class RoleDto {
+
+    public String  roleName;
+
+    public String  roleId;
+
+    public String  roleType;
+}

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

@@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
 import org.rcisoft.core.entity.IdEntity;
 import org.rcisoft.sys.role.entity.SysRole;
+import org.rcisoft.sys.user.dto.RoleDto;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
@@ -100,9 +101,9 @@ public class SysUser extends IdEntity<SysUser> {
 
 
     @Transient
-    private List<SysRole> roleList = Lists.newArrayList(); // 拥有角色列表
+    private List<RoleDto> roleList ; // 拥有角色列表
 
-    @Transient
-    private List<SysRole> roleIdList = Lists.newArrayList(); // 拥有角色id列表
+//    @Transient
+//    private List<SysRole> roleIdList = Lists.newArrayList(); // 拥有角色id列表
 
 }

src/main/resources/mapper/sys/user/mapper/UserMapper.xml

@@ -23,10 +23,10 @@
                     javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleByUserId"
                     column="business_id">
         </collection>
-        <collection property="roleIdList" ofType="org.rcisoft.sys.user.entity.SysUser"
-                    javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleIdByUserId"
-                    column="business_id">
-        </collection>
+<!--        <collection property="roleIdList" ofType="org.rcisoft.sys.user.entity.SysUser"-->
+<!--                    javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleIdByUserId"-->
+<!--                    column="business_id">-->
+<!--        </collection>-->
     </resultMap>
 
 
@@ -36,6 +36,12 @@
         <result column="href" jdbcType="VARCHAR" property="href" />
     </resultMap>
 
+    <resultMap id="RoleDtoMap" type="org.rcisoft.sys.user.dto.RoleDto">
+        <result column="r_name" jdbcType="VARCHAR" property="roleName" />
+        <result column="r_id" jdbcType="VARCHAR" property="roleId" />
+        <result column="r_type" jdbcType="VARCHAR" property="roleType" />
+    </resultMap>
+
     <resultMap id="ChildResultMap" type="org.rcisoft.sys.user.dto.QueryMenuResDTO" extends="DtoResultMap">
         <association column="business_id" property="childList" select="org.rcisoft.sys.menu.dao.SysMenuRepository"></association>
     </resultMap>