审批辅助成本中心选择

src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java

@@ -393,15 +393,21 @@ public class BirBudgetTargetServiceImpl extends ServiceImpl<BirBudgetTargetMappe
                 tempIds.add("-99");
                 query.setSupplierIds(tempIds);
                 List<BirActivityCenterGoods> tempCenterGoodsList = birActivityCenterGoodsMapper.list4CenterSqlserver(query);
-                centerGoodsList.addAll(tempCenterGoodsList);
+                if(tempCenterGoodsList!=null && tempCenterGoodsList.size()>0) {
+                    centerGoodsList.addAll(tempCenterGoodsList);
+                }
             }
         }else{
             //防止传入空数组，导致SQL查出所有客户
             List<String> supplierIds = query.getSupplierIds();
             supplierIds.add("-99");
             query.setSupplierIds(supplierIds);
-            centerGoodsList = birActivityCenterGoodsMapper.list4CenterSqlserver(query);
+            List<BirActivityCenterGoods> tempCenterGoodsList = birActivityCenterGoodsMapper.list4CenterSqlserver(query);
+            if(tempCenterGoodsList!=null && tempCenterGoodsList.size()>0) {
+                centerGoodsList.addAll(tempCenterGoodsList);
+            }
         }
+
         List<String> centerIdList = centerGoodsList.stream().map(a->a.getCenterId()).collect(Collectors.toList());
         return centerIdList;
     }

src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java

@@ -68,12 +68,12 @@ public class BmsCostCenterController {
      */
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:costCenter:query')")
-    public R<List<BmsCostCenterTreeVo>> getTree(Integer loadByCurrent,Integer type, String tartgetId){
+    public R<List<BmsCostCenterTreeVo>> getTree(Integer loadByCurrent,Integer type, String targetId){
         if(loadByCurrent!=null&&loadByCurrent.equals(1)){
             return getTreeByCurrentUser();
         }
         if(loadByCurrent!=null&&loadByCurrent.equals(2)){
-            return getListByCustomerId(type,tartgetId);
+            return getListByCustomerId(type,targetId);
         }
         List<BmsCostCenter> list = bmsCostCenterService.list(new LambdaQueryWrapper<BmsCostCenter>().orderByDesc(BmsCostCenter::getId));
         List<BmsCostCenterTreeVo> treeVoList = list.stream().map(obj->{
@@ -86,12 +86,15 @@ public class BmsCostCenterController {
         return R.ok(TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING));
     }
 
-    public R<List<BmsCostCenterTreeVo>> getListByCustomerId(Integer type, String tartgetId) {
+    public R<List<BmsCostCenterTreeVo>> getListByCustomerId(Integer type, String targetId) {
         BirBudgetTargetSo query = new BirBudgetTargetSo();
         query.setLoadType(type);
         query.setSelectCenterFlag(1);
-        query.setTargetId(tartgetId);
+        query.setTargetId(targetId);
         List<String> centerIds =  birBudgetTargetService.getCenterByTargetId(query);
+        if(centerIds.size()==0){
+            return R.ok(new ArrayList<BmsCostCenterTreeVo>());
+        }
         LambdaQueryWrapper<BmsCostCenter> centerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         centerLambdaQueryWrapper.in(BmsCostCenter::getId,centerIds);
         List<BmsCostCenter> costCenters = bmsCostCenterService.list(centerLambdaQueryWrapper);

src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java

@@ -187,13 +187,16 @@ public class BmsRegion2Controller {
      */
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:region:query')")
-    public R<List<BmsRegionTreeVo>> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer onlySupplierFlag,Integer type, String tartgetId){
+    public R<List<BmsRegionTreeVo>> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer onlySupplierFlag,Integer type, String targetId){
         if(loadByCurrent!=null&&loadByCurrent.equals(2)) {
             BirBudgetTargetSo query = new BirBudgetTargetSo();
             query.setLoadType(type);
-            query.setSelectCenterFlag(1);
-            query.setTargetId(tartgetId);
+            query.setSelectCenterFlag(3);
+            query.setTargetId(targetId);
             List<String> regionIds =  birBudgetTargetService.getCenterByTargetId(query);
+            if(regionIds.size()==0){
+                return R.ok(new ArrayList<BmsRegionTreeVo>());
+            }
             List<BmsRegion2> regionList = bmsRegion2Service.listByIds(regionIds);
             List<BmsRegionTreeVo> treeVoList = new ArrayList<>();
             for (BmsRegion2 region : regionList) {

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -12,6 +12,7 @@ import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.bo.BmsRegionBatchBo;
+import com.qs.serve.modules.bms.entity.vo.BmsCostCenterTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
@@ -91,13 +92,16 @@ public class BmsRegionController {
      */
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:region:query')")
-    public R<List<BmsRegionTreeVo>> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer stopFlag,Integer type, String tartgetId){
+    public R<List<BmsRegionTreeVo>> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer stopFlag,Integer type, String targetId){
         if(loadByCurrent!=null&&loadByCurrent.equals(2)) {
             BirBudgetTargetSo query = new BirBudgetTargetSo();
             query.setLoadType(type);
-            query.setSelectCenterFlag(1);
-            query.setTargetId(tartgetId);
+            query.setSelectCenterFlag(4);
+            query.setTargetId(targetId);
             List<String> regionIds =  birBudgetTargetService.getCenterByTargetId(query);
+            if(regionIds.size()==0){
+                return R.ok(new ArrayList<BmsRegionTreeVo>());
+            }
             List<BmsRegion> regionList = bmsRegionService.listByIds(regionIds);
             List<BmsRegionTreeVo> treeVoList = new ArrayList<>();
             for (BmsRegion region : regionList) {

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -19,6 +19,7 @@ import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierExcelBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierParentBo;
+import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
 import com.qs.serve.modules.bms.mapper.BmsSupplierComRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
@@ -135,6 +136,9 @@ public class BmsSupplierController {
             query.setSelectCenterFlag(2);
             query.setTargetId(param.getTargetId());
             List<String> supplierIds =  birBudgetTargetService.getCenterByTargetId(query);
+            if(supplierIds.size()==0){
+                return R.byPageHelperList(new ArrayList<BmsSupplier>());
+            }
             LambdaQueryWrapper<BmsSupplier> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.in(BmsSupplier::getId,supplierIds);
             List<BmsSupplier> list = bmsSupplierService.list(lambdaQueryWrapper);

src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml

@@ -314,7 +314,7 @@
         year_month_num;
     </select>
 
-    <select id="list4CenterSqlserver" parameterType="com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo" resultType="com.qs.serve.modules.bir.entity.vo.BirBaseDispatchVo">
+    <select id="list4CenterSqlserver" parameterType="com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo" resultType="com.qs.serve.modules.bir.entity.BirActivityCenterGoods">
         SELECT
             distinct center_id
         FROM