账号分配角色相关-列表添加角色字段

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/BackUserAccountVO.java

 package com.mmc.iuav.user.model.vo;
 
+import com.mmc.iuav.user.model.dto.RoleInfoDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -57,4 +58,6 @@ public class BackUserAccountVO implements Serializable {
     private String address;
     @ApiModelProperty(value = "单位信息")
     private CompanyInfoVO companyInfoVO;
+    @ApiModelProperty(value = "角色信息")
+    private RoleInfoDTO roleInfoDTO;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/BackUserAccountDO.java

@@ -34,6 +34,7 @@ public class BackUserAccountDO implements Serializable {
     private Date updateTime;
     private String remark;
     private String address;
+    private RoleInfoDO roleInfoDO;
 
     public BackUserAccountDO(BUserAccountVO bUserAccountVO) {
         this.id = bUserAccountVO.getId();
@@ -48,8 +49,10 @@ public class BackUserAccountDO implements Serializable {
         this.address = bUserAccountVO.getAddress();
     }
 
-    public BackUserAccountVO buildBackUserAccountVO(){
-        return BackUserAccountVO.builder().id(this.id).uid(this.id).accountNo(this.accountNo).phoneNum(this.phoneNum).userName(this.userName).userSex(this.userSex).email(this.email)
-                .accountStatus(this.accountStatus).remark(this.remark).address(this.address).createTime(this.createTime).build();
+    public BackUserAccountVO buildBackUserAccountVO() {
+        return BackUserAccountVO.builder().id(this.id).uid(this.id).accountNo(this.accountNo).phoneNum(this.phoneNum)
+                .userName(this.userName).userSex(this.userSex).email(this.email).accountStatus(this.accountStatus)
+                .remark(this.remark).address(this.address).createTime(this.createTime)
+                .roleInfoDTO(this.roleInfoDO == null ? null : this.roleInfoDO.buildRoleInfoDTO()).build();
     }
 }

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

@@ -19,6 +19,11 @@
         <result property="deleted" column="is_deleted"/>
         <result property="createTime" column="createTime"/>
         <result property="updateTime" column="update_time"/>
+        <association property="roleInfoDO" javaType="com.mmc.iuav.user.entity.RoleInfoDO">
+            <id property="id" column="ri_id"/>
+            <result property="roleNo" column="role_no"/>
+            <result property="roleName" column="role_name"/>
+        </association>
     </resultMap>
 
     <insert id="insertBackUserAccount" parameterType="com.mmc.iuav.user.entity.BackUserAccountDO" keyProperty="id"
@@ -107,7 +112,7 @@
     <select id="countListBackUserAccount" resultType="java.lang.Integer"
             parameterType="com.mmc.iuav.user.model.qo.BUserAccountQO">
         select count(*) from back_user_account bua
-        left join user_role_rel urr on urr.user_account_id=bua.id
+        left join user_role_rel urr on urr.back_user_account_id = bua.id
         where bua.is_deleted = 0
         <if test=" keyword != null and keyword != '' ">
             and ( bua.account_no like CONCAT("%",#{keyword},"%") or
@@ -146,10 +151,14 @@
         bua.address,
         bua.remark,
         bua.create_time,
-        bua.update_time
+        bua.update_time,
+        ri.id as ri_id,
+        ri.role_name,
+        ri.role_no
         FROM
         back_user_account bua
-        left join user_role_rel urr on urr.user_account_id=bua.id
+        left join user_role_rel urr on urr.back_user_account_id = bua.id
+        left join role_info ri on ri.id = urr.role_id
         WHERE
         bua.is_deleted = 0
         <if test=" keyword != null and keyword != '' ">