Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-sb into demo_

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -289,6 +289,8 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         List<CheckStandardParam> paramList = paramMapper.selectByExample(weekend);
         checkStandard.setParamList(paramList);*/
 
+
+
         if(checkStandard == null){
             throw new BusinessException("保养标准已经删除，该任务无需执行，请删除该任务");
         }

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -3,8 +3,10 @@ package com.platform.service.store.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.cache.ConfigCache;
 import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
+import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
@@ -243,6 +245,16 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setUserId(userInfo.getUserId());
         }
+        UserInfo userInfo1 = SecurityUtils.getUserInfo();
+        String userNames = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.STORE_SUPER_USERS.name());
+        if(StringUtils.isBlank(userNames)){
+            throw new DeniedException("请设置仓库菜单的超级用户");
+        }
+        if(userNames.contains(userInfo1.getUsername())){
+            model.setUserId(null);
+        }else {
+            model.setUserId(userInfo1.getUserId());
+        }
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(model));
     }

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -2,8 +2,10 @@ package com.platform.service.store.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.cache.ConfigCache;
 import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
+import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
@@ -75,6 +77,17 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setUserId(userInfo.getUserId());
         }
+        UserInfo userInfo1 = SecurityUtils.getUserInfo();
+        String userNames = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.STORE_SUPER_USERS.name());
+        if(StringUtils.isBlank(userNames)){
+            throw new DeniedException("请设置仓库菜单的超级用户");
+        }
+        if(userNames.contains(userInfo1.getUsername())){
+            model.setUserId(null);
+        }else {
+            model.setUserId(userInfo1.getUserId());
+        }
+
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(model));
     }