user api

farm-common/src/main/java/jp/yamoto/farm/common/core/domain/entity/SysUser.java

@@ -109,6 +109,16 @@ public class SysUser extends BaseEntity
     /** ロールID */
     private Long roleId;
 
+    /**
+     * ロール
+     */
+    private String roleLabel;
+
+    /**
+     * 利用状態
+     */
+    private String statusLabel;
+
     public SysUser()
     {
 
@@ -303,6 +313,22 @@ public class SysUser extends BaseEntity
         this.roleId = roleId;
     }
 
+    public String getRoleLabel() {
+        return roleLabel;
+    }
+
+    public void setRoleLabel(String roleLabel) {
+        this.roleLabel = roleLabel;
+    }
+
+    public String getStatusLabel() {
+        return statusLabel;
+    }
+
+    public void setStatusLabel(String statusLabel) {
+        this.statusLabel = statusLabel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

farm-crm-biz/src/main/resources/mapper/crm/SysUserMapper.xml

@@ -23,6 +23,8 @@
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
+		<result property="statusLabel"  column="status_label" />
+		<result property="roleLabel"    column="role_name"    />
 		<collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
 	</resultMap>
 
@@ -41,12 +43,17 @@
 		from sys_user u
 				 left join sys_user_role ur on u.user_id = ur.user_id
 				 left join sys_role r on r.role_id = ur.role_id
+
 	</sql>
 
 	<select id="selectUserList" parameterType="SysUserQueryBo" resultMap="SysUserResult">
 		select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip
-		, u.login_date,u.version, u.create_by, u.create_time, u.remark
+			, u.login_date,u.version, u.create_by, u.create_time, r.role_name, u.remark, sdd.dict_label as status_label
 		from sys_user u
+		left join sys_user_role ur on u.user_id = ur.user_id
+		left join sys_role r on r.role_id = ur.role_id
+		left join sys_dict_data sdd
+		on  sdd.dict_value = u.status and sdd.dict_type = 'sys_usage_status'
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -64,10 +71,10 @@
 			</foreach>
 		</if>
 		<if test="roleIdList != null">
-			AND user_id in (SELECT user_id FROM sys_user_role WHERE role_id IN
+			AND ur.role_id IN
 			 	<foreach collection="roleIdList" item="roleId" open="(" separator="," close=")">
 					#{roleId}
-				</foreach>)
+				</foreach>
 		</if>
 	</select>