商会规则，部分商户进行运维用户过滤

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleEnterpriseDTO.java

@@ -2,6 +2,7 @@ package com.gic.enterprise.dto.rule;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 商户规则
@@ -51,6 +52,11 @@ public class RuleEnterpriseDTO implements Serializable{
      */
     private String ruleIds;
 
+    /**
+     * 运维登录用户所拥有的权限商户集合，如果是空的，表示全部商户
+     */
+    private List<Integer> enterpriseIdList;
+
     /***************************下面是前端展示字段*****************************/
 
     /**
@@ -193,4 +199,13 @@ public class RuleEnterpriseDTO implements Serializable{
         this.logo = logo;
         return this;
     }
+
+    public List<Integer> getEnterpriseIdList() {
+        return enterpriseIdList;
+    }
+
+    public RuleEnterpriseDTO setEnterpriseIdList(List<Integer> enterpriseIdList) {
+        this.enterpriseIdList = enterpriseIdList;
+        return this;
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java

@@ -2,6 +2,7 @@ package com.gic.enterprise.service.outer.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.rule.RuleEnterpriseDTO;
@@ -278,7 +279,17 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         List<Integer> enterpriseIdList = new ArrayList<>();
         //已存在的商户ID
         Set<String> enterpriseSet = new HashSet<>();
-        List<EnterpriseDTO> enterpriseDTOList = enterpriseService.listEnterprise();
+
+        List<EnterpriseDTO> enterpriseDTOList;
+        //运维登录用户商户权限过滤
+        List<Integer> operationAuthEnterprise = dto.getEnterpriseIdList();
+        if (CollectionUtils.isNotEmpty(operationAuthEnterprise)) {
+            enterpriseDTOList = EntityUtil.changeEntityListNew(EnterpriseDTO.class,
+                    enterpriseService.listEnterpriseByIds(enterpriseIdList));
+        } else {
+            enterpriseDTOList = enterpriseService.listEnterprise();
+        }
+
         if (CollectionUtils.isNotEmpty(enterpriseDTOList)) {
             for (EnterpriseDTO enterpriseDTO : enterpriseDTOList) {
                 enterpriseSet.add(enterpriseDTO.getEnterpriseId().toString());
@@ -299,7 +310,8 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
                 }
                 Integer id = Integer.parseInt(str);
                 if (!enterpriseSet.contains(id.toString())) {
-                    return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "部分商户数据错误，不存在的商户");
+                    //不存在的商户或者没有权限的商户
+                    //return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "部分商户数据错误，不存在的商户");
                 }
                 enterpriseTempSet.add(str);
             }

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/ConfigRuleController.java

@@ -8,6 +8,7 @@ import com.gic.authcenter.security.core.dto.EnterpriseTempDTO;
 import com.gic.authcenter.security.core.dto.UserDetailsVO;
 import com.gic.authcenter.security.core.util.UserUtils;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.operation.web.utils.OperationUserEnterpriseUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -162,6 +163,8 @@ public class ConfigRuleController {
         if (dto.getEnterpriseRuleId() != null) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "规则ID有值");
         }
+        //过滤运维登录用户商户权限
+        dto.setEnterpriseIdList(OperationUserEnterpriseUtils.getAuthEnterpriseIdList());
         return ResultControllerUtils.commonResult(configRuleEnterpriseApiService.save(dto));
     }
 
@@ -181,6 +184,8 @@ public class ConfigRuleController {
         if (dto.getEnterpriseRuleId() == null) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "规则ID不能为空");
         }
+        //过滤运维登录用户商户权限
+        dto.setEnterpriseIdList(OperationUserEnterpriseUtils.getAuthEnterpriseIdList());
         return ResultControllerUtils.commonResult(configRuleEnterpriseApiService.edit(dto));
     }
 
@@ -198,26 +203,8 @@ public class ConfigRuleController {
     
*/
     @RequestMapping("/list-enterprise-select")
     public RestResponse listEnterpriseSelect(String search) {
-        //过滤运维用户的权限商户
-        UserDetailsVO user = UserUtils.getUser();
-        //是否拥有全部商户
-        boolean permissionAll = user.getAuthorities().stream().anyMatch(
-                sga -> Objects.equals(sga.getAuthority(),
-                        AuthcenterUserDetails.DATA_PREFIX + DataResourceEnum.all_enterprise.name()
-                )
-        );
-        List<Integer> enterpriseIdList = null;
-        if (!permissionAll) {
-            //运维拥有的权限商户ID集合
-            enterpriseIdList = new ArrayList<>();
-            List<EnterpriseTempDTO> enterpriseTemp = user.getEnterpriseList();
-            if (CollectionUtils.isNotEmpty(enterpriseTemp)) {
-                for (EnterpriseTempDTO enterpriseTempDTO : enterpriseTemp) {
-                    enterpriseIdList.add(Integer.parseInt(enterpriseTempDTO.getEnterpriseId()));
-                }
-            }
-        }
-        return ResultControllerUtils.commonResult(configRuleApiService.getEnterpriseList(search, enterpriseIdList));
+        return ResultControllerUtils.commonResult(
+                configRuleApiService.getEnterpriseList(search, OperationUserEnterpriseUtils.getAuthEnterpriseIdList()));
     }
 
     @RequestMapping("/deleteEnterpriseRule")

gic-platform-operation-web/src/main/java/com/gic/operation/web/utils/OperationUserEnterpriseUtils.java

+package com.gic.operation.web.utils;
+
+import com.gic.authcenter.security.core.constant.DataResourceEnum;
+import com.gic.authcenter.security.core.dto.AuthcenterUserDetails;
+import com.gic.authcenter.security.core.dto.EnterpriseTempDTO;
+import com.gic.authcenter.security.core.dto.UserDetailsVO;
+import com.gic.authcenter.security.core.util.UserUtils;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 运维登录用户的商户权限
+ * @ClassName: OperationUserEnterpriseUtils

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/5/14 3:46 PM

+ */
+public class OperationUserEnterpriseUtils {
+
+    /**
+     * 运维登录用户的商户权限
+     * @return
+     */
+    public static List<Integer> getAuthEnterpriseIdList() {
+        //过滤运维用户的权限商户
+        UserDetailsVO user = UserUtils.getUser();
+        //是否拥有全部商户
+        boolean permissionAll = user.getAuthorities().stream().anyMatch(
+                sga -> Objects.equals(sga.getAuthority(),
+                        AuthcenterUserDetails.DATA_PREFIX + DataResourceEnum.all_enterprise.name()
+                )
+        );
+        List<Integer> enterpriseIdList = null;
+        if (!permissionAll) {
+            //运维拥有的权限商户ID集合
+            enterpriseIdList = new ArrayList<>();
+            List<EnterpriseTempDTO> enterpriseTemp = user.getEnterpriseList();
+            if (CollectionUtils.isNotEmpty(enterpriseTemp)) {
+                for (EnterpriseTempDTO enterpriseTempDTO : enterpriseTemp) {
+                    enterpriseIdList.add(Integer.parseInt(enterpriseTempDTO.getEnterpriseId()));
+                }
+            }
+        }
+        return enterpriseIdList;
+    }
+}