From c6a1a7b4de1352f56ab14e05b45593599bac7ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 12 Jul 2021 01:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotHeadController.java   |  8 +++--
 .../jsh/erp/service/depot/DepotService.java   | 31 +++++++++++++------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 334d524d..94337260 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -206,9 +206,13 @@ public class DepotHeadController {
                 Supplier supplier = supplierService.getSupplier(organId);
                 BigDecimal beginNeed = BigDecimal.ZERO;
                 if (("客户").equals(supType)) {
-                    beginNeed = supplier.getBeginNeedGet();
+                    if(supplier.getBeginNeedGet()!=null) {
+                        beginNeed = supplier.getBeginNeedGet();
+                    }
                 } else if (("供应商").equals(supType)) {
-                    beginNeed = supplier.getBeginNeedPay();
+                    if(supplier.getBeginNeedPay()!=null) {
+                        beginNeed = supplier.getBeginNeedPay();
+                    }
                 }
                 BigDecimal firstMoney = depotHeadService.findTotalPay(organId, beginTime, supType)
                         .subtract(accountHeadService.findTotalPay(organId, beginTime, supType)).add(beginNeed);
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
index f5c96f7f..6d9e49bf 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
@@ -282,16 +282,29 @@ public class DepotService {
         //开始拼接json数据
         if (null != dataList) {
             boolean depotFlag = systemConfigService.getDepotFlag();
-            for (Depot depot : dataList) {
-                JSONObject item = new JSONObject();
-                //勾选判断1
-                Boolean flag = false;
-                try {
-                    flag = userBusinessService.checkIsUserBusinessExist(type, userId.toString(), "[" + depot.getId().toString() + "]");
-                } catch (DataAccessException e) {
-                    logger.error(">>>>>>>>>>>>>>>>>查询用户对应的仓库：类型" + type + " KeyId为： " + userId + " 存在异常！");
+            if(depotFlag) {
+                List<UserBusiness> list = userBusinessService.getBasicData(userId.toString(), type);
+                if(list!=null && list.size()>0) {
+                    String depotStr = list.get(0).getValue();
+                    if(StringUtil.isNotEmpty(depotStr)){
+                        depotStr = depotStr.replaceAll("\\[", "").replaceAll("]", ",");
+                        String[] depotArr = depotStr.split(",");
+                        for(String depotId: depotArr) {
+                            JSONObject item = new JSONObject();
+                            item.put("id", depotId);
+                            for (Depot depot : dataList) {
+                                if(depot.getId() == Integer.parseInt(depotId)){
+                                    item.put("depotName", depot.getName());
+                                    item.put("isDefault", depot.getIsDefault());
+                                }
+                            }
+                            arr.add(item);
+                        }
+                    }
                 }
-                if (!depotFlag || flag) {
+            } else {
+                for (Depot depot : dataList) {
+                    JSONObject item = new JSONObject();
                     item.put("id", depot.getId());
                     item.put("depotName", depot.getName());
                     item.put("isDefault", depot.getIsDefault());