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

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/StoreServiceImpl.java

@@ -240,7 +240,7 @@ 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()));
+//        ExecuteSql.executeNotNull(model.getUserId(), () -> weekendCriteria.andEqualTo(Store::getUserId, model.getUserId()));
 
         // 登录人自己负责的仓库列表
         if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {