字典修改只获取开启状态数据,权限修改增加不做控制权限

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/framework/rpc/config/RpcConfiguration.java

@@ -1,6 +1,7 @@
 package com.zjugis.module.adm.framework.rpc.config;
 
 import com.zjugis.module.infra.api.config.ConfigApi;
+import com.zjugis.module.infra.api.ding.DingApi;
 import com.zjugis.module.system.api.dept.DeptApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -12,6 +13,6 @@ import org.springframework.context.annotation.Configuration;
  * @Version 1.0
  */
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, ConfigApi.class})
+@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, ConfigApi.class, DingApi.class})
 public class RpcConfiguration {
 }

zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/enums/permission/DataScopeEnum.java

@@ -20,7 +20,8 @@ public enum DataScopeEnum {
     DEPT_ONLY(3), // 部门数据权限
     DEPT_AND_CHILD(4), // 部门及以下数据权限
 
-    SELF(5); // 仅本人数据权限
+    SELF(5), // 仅本人数据权限
+    NONE(0); // 不做控制
 
     /**
      * 范围

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/dal/mysql/dict/DictDataMapper.java

@@ -1,5 +1,6 @@
 package com.zjugis.module.system.dal.mysql.dict;
 
+import com.zjugis.framework.common.enums.CommonStatusEnum;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.mybatis.core.mapper.BaseMapperX;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -56,4 +57,8 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
     default List<DictDataDO> getDictDataListByTypes(Collection<String> types) {
         return selectList(new LambdaQueryWrapperX<DictDataDO>().inIfPresent(DictDataDO::getDictType, types));
     }
+
+    default List<DictDataDO> selectEnableList(){
+        return selectList(new LambdaQueryWrapperX<DictDataDO>().eqIfPresent(DictDataDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
+    }
 }

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/dict/DictDataServiceImpl.java

@@ -49,7 +49,7 @@ public class DictDataServiceImpl implements DictDataService {
 
     @Override
     public List<DictDataDO> getDictDataList() {
-        List<DictDataDO> list = dictDataMapper.selectList();
+        List<DictDataDO> list = dictDataMapper.selectEnableList();
         list.sort(COMPARATOR_TYPE_AND_SORT);
         return list;
     }

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/permission/PermissionServiceImpl.java

@@ -285,7 +285,7 @@ public class PermissionServiceImpl implements PermissionService {
         // 遍历每个角色，计算
         for (RoleDO role : roles) {
             // 为空时，跳过
-            if (role.getDataScope() == null) {
+            if (role.getDataScope() == null || Objects.equals(role.getDataScope(), DataScopeEnum.NONE.getScope())) {
                 continue;
             }
             // 情况一，ALL