用户列表数据隔离

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/RoleInfoQO.java

@@ -21,6 +21,9 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class RoleInfoQO implements Serializable {
     private static final long serialVersionUID = -3729786590325257669L;
+    @ApiModelProperty(value = "权限角色/或者编号", required = false, hidden = true)
+    private Integer id;
+    
     @ApiModelProperty(value = "权限角色/或者编号", required = false)
     private String NumberOrName;
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/enums/CompanyTypeEnums.java

+package com.mmc.iuav.user.enums;
+
+/**
+ * @author: zj
+ * @Date: 2023/7/26 16:25
+ */
+public enum CompanyTypeEnums {
+    KBT(0, "科比特"),
+    FRANCHISEE(1, "加盟商");
+
+    private Integer type;
+    private String name;
+
+    CompanyTypeEnums(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

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

@@ -7,6 +7,7 @@ import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.dao.RoleDao;
 import com.mmc.iuav.user.entity.MenuInfoDO;
 import com.mmc.iuav.user.entity.RoleInfoDO;
+import com.mmc.iuav.user.enums.CompanyTypeEnums;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.MenuInfoDTO;
 import com.mmc.iuav.user.model.qo.RoleInfoQO;
@@ -70,7 +71,11 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public PageResult listPageRoleInfo(RoleInfoQO param, LoginSuccessDTO userLoginInfoFromRedis) {
+    public PageResult listPageRoleInfo(RoleInfoQO param, LoginSuccessDTO loginSuccessDTO) {
+        // 加盟公司只能看自己拥有的角色
+        if (!loginSuccessDTO.getCompanyInfoVO().getCompanyType().equals(CompanyTypeEnums.KBT.getType())) {
+            param.setId(loginSuccessDTO.getRoleInfo().getId());
+        }
         int count = roleDao.countPageRoleInfo(param);
         if (count == 0) {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);

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

@@ -145,6 +145,9 @@
         INNER JOIN back_user_account ua ON r.back_user_account_id = ua.id
         WHERE
         r.is_deleted =0
+        <if test="id != null">
+            and r.id = #{id}
+        </if>
         <if test=" NumberOrName != null and NumberOrName != '' ">
             and (r.role_no =#{NumberOrName}) or
             (r.role_name =#{NumberOrName})
@@ -169,6 +172,9 @@
         INNER JOIN back_user_account ua ON r.back_user_account_id = ua.id
         WHERE
         r.is_deleted =0
+        <if test="id != null">
+            and r.id = #{id}
+        </if>
         <if test=" NumberOrName != null and NumberOrName != '' ">
             and (r.role_no =#{NumberOrName}) or
             (r.role_name =#{NumberOrName})