role(add)

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/RoleDao.java

 package com.mmc.iuav.user.dao;
 
 import com.mmc.iuav.user.entity.RoleInfoDO;
+import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.model.qo.RoleInfoQO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -34,6 +35,6 @@ public interface RoleDao {
 
     Integer countNotDelUserAccountByRole(Integer id);
 
-    List<RoleInfoDO> roleAccountList(Integer id);
+    List<UserAccountDO> roleAccountList(Integer id);
 }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RoleServiceImpl.java

@@ -6,7 +6,9 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.dao.RoleDao;
 import com.mmc.iuav.user.entity.RoleInfoDO;
+import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
+import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.qo.RoleInfoQO;
 import com.mmc.iuav.user.model.vo.RoleInfoVO;
 import com.mmc.iuav.user.service.RoleService;
@@ -79,8 +81,9 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     public ResultBody roleAccountList(Integer id) {
-        List<RoleInfoDO> roleInfoDOS = roleDao.roleAccountList(id);
-        return ResultBody.success(roleInfoDOS);
+        List<UserAccountDO> roleInfoDOS = roleDao.roleAccountList(id);
+        List<UserAccountSimpleDTO> accountSimpleDTOS = roleInfoDOS.stream().map(UserAccountDO::buildUserAccountSimpleDTO).collect(Collectors.toList());
+        return ResultBody.success(accountSimpleDTOS);
     }
 
 

csm-service/cms-service-user/src/main/resources/mapper/RoleDao.xml

@@ -21,6 +21,27 @@
     </resultMap>
 
 
+    <resultMap id="userAccountResultMap" type="com.mmc.iuav.user.entity.UserAccountDO">
+        <id property="id" column="id"/>
+        <result property="uid" column="uid"/>
+        <result property="phoneNum" column="phone_num"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="userImg" column="user_img"/>
+        <result property="openId" column="open_id"/>
+        <result property="unionId" column="union_id"/>
+        <result property="userSex" column="user_sex"/>
+        <result property="email" column="email"/>
+        <result property="source" column="source"/>
+        <result property="accountStatus" column="account_status"/>
+        <result property="remark" column="remark"/>
+        <result property="portType" column="port_type"/>
+        <result property="deleted" column="is_deleted"/>
+        <result property="createTime" column="createTime"/>
+        <result property="updateTime" column="update_time"/>
+
+    </resultMap>
+
     <select id="countRoleName" resultType="int">
         select count(*)
         from role_info r
@@ -140,9 +161,13 @@
           AND ua.is_deleted = 0
     </select>
 
-    <select id="roleAccountList" resultMap="roleInfoResultMap">
+    <select id="roleAccountList" resultMap="userAccountResultMap">
         SELECT urr.user_account_id,
-               ua.user_name
+               ua.user_name,
+               ua.uid,
+               ua.phone_num,
+               ua.user_name,
+               ua.is_deleted
         FROM user_role_rel urr
                  LEFT JOIN user_account ua ON ua.id = urr.user_account_id
         WHERE urr.role_id = #{id}