Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/enums/SysConfigEnum.java

@@ -43,7 +43,8 @@ public enum SysConfigEnum {
     REPAIR_FEE_TYPE_MAPS("维修费用类别集合"),
     SPARE_WARN_FORREST_EMAIL("保养库存邮件邮箱"),
     REPAIR_SUPER_USERS("维修管理中的超级用户集合"),
-    PURCHASE_FORM_SUPER_USERS("采购入库单的超级用户集合");
+    PURCHASE_FORM_SUPER_USERS("采购入库单的超级用户集合"),
+    STORE_SUPER_USERS("仓库管理中的超级用户集合");
     private final String typeName;
 
 }

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -54,10 +54,10 @@
             and outstoreform.out_no = #{outNo}
         </if>
         <if test="type != null and type!=6">
-            and instoreform.type = #{type}
+            and outstoreform.type = #{type}
         </if>
         <if test="type==6">
-            and (instoreform.type=4 or instoreform.type=5)
+            and (outstoreform.type=4 or instoreform.type=5)
         </if>
         <if test="remark != null and remark != ''">
             and outstoreform.remark = #{remark}

platform-rest/src/main/java/com/platform/rest/controller/store/StoreController.java

@@ -215,7 +215,7 @@ public class StoreController {
     @GetMapping("tableTree")
     public R queryTableTree(StoreDTO storeDTO) {
         String userId= SecurityUtils.getUserInfo().getUserId();
-//        storeDTO.setUserId(userId);
+        storeDTO.setUserId(userId);
         List<Store> typeList= storeService.getModelListByDTO(storeDTO);
         List<Store> parentList = new ArrayList<Store>();
         for(Store type: typeList){

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

@@ -116,6 +116,7 @@ public class PurchaseStoreFormServiceImpl extends BaseServiceImpl<PurchaseStoreF
             queryDTO.setPurchaseStoreFormId(record.getId());
             queryDTO.setDeleteFlag(0);
             queryDTO.setSparePartInfoId(record.getSpareId());
+            queryDTO.setCreatedTime(null);
             int count = purchaseStoreFormDetailMapper.selectCount(queryDTO);
             if(count > 0) {
                 throw  new DeniedException("您选择的备件，已被您放入采购单中");

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

@@ -2,12 +2,15 @@ package com.platform.service.store.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 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.BeanConverterUtil;
 import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.SecurityUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
 import com.platform.dao.dto.sb.SbTypeDTO;
@@ -20,6 +23,7 @@ import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.DelFlagEnum;
 import com.platform.dao.enums.DeptNatureEnum;
 import com.platform.dao.enums.StoreLevelEnum;
+import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.mapper.store.SpareStoreMapper;
 import com.platform.dao.mapper.upms.SysDeptMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
@@ -240,7 +244,19 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
         ExecuteSql.executeNotEmpty(model.getId(), () -> weekendCriteria.andNotEqualTo(Store::getId, model.getId()));
         ExecuteSql.executeNotEmpty(model.getUseProject(), () -> weekendCriteria.andEqualTo(Store::getUseProject, model.getUseProject()));
         ExecuteSql.executeNotNull(model.getLevel(), () -> weekendCriteria.andEqualTo(Store::getLevel, model.getLevel()));
-//        ExecuteSql.executeNotNull(model.getUserId(), () -> weekendCriteria.andEqualTo(Store::getUserId, model.getUserId()));
+//        System.out.println(model.getUserId());
+//        System.out.println(SecurityUtils.getUserInfo().getUserId());
+        String userNames = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.STORE_SUPER_USERS.name());
+        UserInfo userInfo1=SecurityUtils.getUserInfo();
+        if(StringUtils.isBlank(userNames)){
+            throw new DeniedException("请设置仓库菜单的超级用户");
+        }
+        if(userNames.contains(userInfo1.getUsername())){
+            model.setUserId(null);
+        }
+        if(model.getUserId()!=null){
+            ExecuteSql.executeNotNull(model.getUserId(), () -> weekendCriteria.andEqualTo(Store::getUserId, model.getUserId()));
+        }
 
         // 登录人自己负责的仓库列表
         if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {