修改门店权限

src/main/java/org/rcisoft/bean/AdminProperties.java

+package org.rcisoft.bean;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@ConfigurationProperties(prefix = "cy.init")
+public class AdminProperties {
+
+    private List<String> admin;
+    private List<String> adminRole;
+
+    public List<String> getAdmin() {
+        return admin;
+    }
+
+    public void setAdmin(List<String> admin) {
+        this.admin = admin;
+    }
+
+    public List<String> getAdminRole() {
+        return adminRole;
+    }
+
+    public void setAdminRole(List<String> adminRole) {
+        this.adminRole = adminRole;
+    }
+}

src/main/java/org/rcisoft/bus/custinfo/service/impl/CustInfoServiceImpl.java

@@ -2,12 +2,14 @@ package org.rcisoft.bus.custinfo.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.rcisoft.bean.AdminProperties;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.bus.custinfo.dao.CustInfoRepository;
 import org.rcisoft.bus.custinfo.entity.CustInfo;
 import org.rcisoft.bus.custinfo.service.CustInfoService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -31,8 +33,8 @@ import lombok.extern.slf4j.Slf4j;
 public class CustInfoServiceImpl extends ServiceImpl<CustInfoRepository,CustInfo>  implements CustInfoService {
 
 
-    @Value("${cy.init.adminRole}")
-    private String[] adminRoleIds;
+    @Autowired
+    protected AdminProperties adminProperties;
 
 
     /**
@@ -114,15 +116,16 @@ public class CustInfoServiceImpl extends ServiceImpl<CustInfoRepository,CustInfo
 
         // 获取当前用户的角色ID
         String roleIds = CyUserUtil.getAuthenRoleIds();
+        boolean adminKey = adminProperties.getAdmin().contains(CyUserUtil.getAuthenBusinessId());
         // 将角色ID字符串分割成数组，并去除每个ID前后的空白字符
         Set<String> userRoles = Arrays.stream(roleIds.split(","))
                 .map(String::trim)
                 .collect(Collectors.toSet());
         // 检查当前用户是否有管理员权限
-        boolean isAdmin = Arrays.stream(adminRoleIds)
-                .anyMatch(userRoles::contains);
+        boolean isAdmin = userRoles.stream()
+                .anyMatch(adminProperties.getAdminRole()::contains);
         // 根据是否是管理员调整查询条件
-        if (!isAdmin) {
+        if (!isAdmin || !adminKey) {
             custInfo.setStoreId(CyUserUtil.getAuthenDept());
         }
 

src/main/java/org/rcisoft/bus/custrecharge/service/impl/CustRechargeServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.rcisoft.bean.AdminProperties;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.aop.CyPageUtilAsp;
 import org.rcisoft.core.model.CyPersistModel;
@@ -38,8 +39,8 @@ import lombok.extern.slf4j.Slf4j;
 public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository,CustRecharge>  implements CustRechargeService {
 
 
-    @Value("${cy.init.adminRole}")
-    private String[] adminRoleIds;
+    @Autowired
+    protected AdminProperties adminProperties;
 
     /**
     * 保存 客户消费表
@@ -119,18 +120,18 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository,
 
         // 获取当前用户的角色ID
         String roleIds = CyUserUtil.getAuthenRoleIds();
+        boolean adminKey = adminProperties.getAdmin().contains(CyUserUtil.getAuthenBusinessId());
         // 将角色ID字符串分割成数组，并去除每个ID前后的空白字符
         Set<String> userRoles = Arrays.stream(roleIds.split(","))
                 .map(String::trim)
                 .collect(Collectors.toSet());
         // 检查当前用户是否有管理员权限
-        boolean isAdmin = Arrays.stream(adminRoleIds)
-                .anyMatch(userRoles::contains);
+        boolean isAdmin = userRoles.stream()
+                .anyMatch(adminProperties.getAdminRole()::contains);
         // 根据是否是管理员调整查询条件
-        if (!isAdmin) {
+        if (!isAdmin || !adminKey) {
             custRecharge.setStoreId(CyUserUtil.getAuthenDept());
         }
-
         return baseMapper.queryCustRechargesPaged(paginationUtility,custRecharge);
 
     }

src/main/java/org/rcisoft/bus/storegoodsapply/service/impl/StoreGoodsApplyServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.bean.AdminProperties;
 import org.rcisoft.bus.storegoodsapply.dao.StoreGoodsApplyRepository;
 import org.rcisoft.bus.storegoodsapply.dto.AddStoreGoodsApplyDTO;
 import org.rcisoft.bus.storegoodsapply.entity.StoreGoodsApply;
@@ -52,8 +53,9 @@ public class StoreGoodsApplyServiceImpl extends ServiceImpl<StoreGoodsApplyRepos
     @Autowired
     private StoreGoodsStockRepository storeGoodsStockRepository;
 
-    @Value("${cy.init.adminRole}")
-    private String[] adminRoleIds;
+
+    @Autowired
+    protected AdminProperties adminProperties;
 
     /**
      * 保存 商品申请表
@@ -281,15 +283,16 @@ public class StoreGoodsApplyServiceImpl extends ServiceImpl<StoreGoodsApplyRepos
                                                       StoreGoodsApply storeGoodsApply) {
         // 获取当前用户的角色ID
         String roleIds = CyUserUtil.getAuthenRoleIds();
+        boolean adminKey = adminProperties.getAdmin().contains(CyUserUtil.getAuthenBusinessId());
         // 将角色ID字符串分割成数组，并去除每个ID前后的空白字符
         Set<String> userRoles = Arrays.stream(roleIds.split(","))
                 .map(String::trim)
                 .collect(Collectors.toSet());
         // 检查当前用户是否有管理员权限
-        boolean isAdmin = Arrays.stream(adminRoleIds)
-                .anyMatch(userRoles::contains);
+        boolean isAdmin = userRoles.stream()
+                .anyMatch(adminProperties.getAdminRole()::contains);
         // 根据是否是管理员调整查询条件
-        if (!isAdmin) {
+        if (!isAdmin || !adminKey) {
             storeGoodsApply.setStoreId(CyUserUtil.getAuthenDept());
         }
         return baseMapper.queryWmsGoodsApplysPaged(paginationUtility, storeGoodsApply);
@@ -301,15 +304,16 @@ public class StoreGoodsApplyServiceImpl extends ServiceImpl<StoreGoodsApplyRepos
                                                          StoreGoodsApply storeGoodsApply) {
         // 获取当前用户的角色ID
         String roleIds = CyUserUtil.getAuthenRoleIds();
+        boolean adminKey = adminProperties.getAdmin().contains(CyUserUtil.getAuthenBusinessId());
         // 将角色ID字符串分割成数组，并去除每个ID前后的空白字符
         Set<String> userRoles = Arrays.stream(roleIds.split(","))
                 .map(String::trim)
                 .collect(Collectors.toSet());
         // 检查当前用户是否有管理员权限
-        boolean isAdmin = Arrays.stream(adminRoleIds)
-                .anyMatch(userRoles::contains);
+        boolean isAdmin = userRoles.stream()
+                .anyMatch(adminProperties.getAdminRole()::contains);
         // 根据是否是管理员调整查询条件
-        if (!isAdmin) {
+        if (!isAdmin || !adminKey) {
             storeGoodsApply.setStoreId(CyUserUtil.getAuthenDept());
         }
         return baseMapper.queryWmsGoodsApplysOutPaged(paginationUtility, storeGoodsApply);

src/main/java/org/rcisoft/bus/storegoodsstock/service/impl/StoreGoodsStockServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.rcisoft.bean.AdminProperties;
 import org.rcisoft.bus.storegoodslog.dao.StoreGoodsLogRepository;
 import org.rcisoft.bus.storegoodslog.entity.StoreGoodsLog;
 import org.rcisoft.bus.storegoodsstock.dao.StoreGoodsStockRepository;
@@ -40,8 +41,8 @@ public class StoreGoodsStockServiceImpl extends ServiceImpl<StoreGoodsStockRepos
     @Autowired
     StoreGoodsLogRepository wmsGoodsLogRepository;
 
-    @Value("${cy.init.adminRole}")
-    private String[] adminRoleIds;
+    @Autowired
+    protected AdminProperties adminProperties;
 
     /**
     * 保存 库存管理表
@@ -52,6 +53,7 @@ public class StoreGoodsStockServiceImpl extends ServiceImpl<StoreGoodsStockRepos
     @Override
     public CyPersistModel persist(StoreGoodsStock storeGoodsStock){
         //增加操作
+        storeGoodsStock.setStoreId(CyUserUtil.getAuthenDept());
         int line = baseMapper.insert(storeGoodsStock);
         log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+
             storeGoodsStock.getBusinessId()+"的库存管理表信息");
@@ -139,16 +141,18 @@ public class StoreGoodsStockServiceImpl extends ServiceImpl<StoreGoodsStockRepos
                                                                     StoreGoodsStockPageResultsDto storeGoodsStock){
         // 获取当前用户的角色ID
         String roleIds = CyUserUtil.getAuthenRoleIds();
+        boolean adminKey = adminProperties.getAdmin().contains(CyUserUtil.getAuthenBusinessId());
         // 将角色ID字符串分割成数组，并去除每个ID前后的空白字符
         Set<String> userRoles = Arrays.stream(roleIds.split(","))
                 .map(String::trim)
                 .collect(Collectors.toSet());
         // 检查当前用户是否有管理员权限
-        boolean isAdmin = Arrays.stream(adminRoleIds)
-                .anyMatch(userRoles::contains);
+        boolean isAdmin = userRoles.stream()
+                .anyMatch(adminProperties.getAdminRole()::contains);
         // 根据是否是管理员调整查询条件
-        if (!isAdmin) {
+        if (!isAdmin || !adminKey) {
             storeGoodsStock.setStoreId(CyUserUtil.getAuthenDept());
+            System.out.println("不是管理员");
         }
         return baseMapper.queryWmsGoodsStocksPaged(paginationUtility, storeGoodsStock);
     }

src/main/resources/application-spbt.yml

@@ -18,7 +18,8 @@ cy:
   init:
     admin:
       - "1"
-    adminRole: "1"
+    adminRole:
+      - "1"
     permission:
       - "44"
       - "51"