From fdfd69c2021e602527a1aed05bece4af7360bf52 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, 13 Dec 2021 23:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=A3=E5=86=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=AD=E4=BB=93=E5=BA=93=E6=8E=92=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/service/depot/DepotService.java   | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

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 3dc61def..46202727 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
@@ -231,7 +231,7 @@ public class DepotService {
     public List<Depot> findUserDepot()throws Exception{
         DepotExample example = new DepotExample();
         example.createCriteria().andTypeEqualTo(0).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("Sort");
+        example.setOrderByClause("sort");
         List<Depot> list=null;
         try{
             list= depotMapper.selectByExample(example);
@@ -241,19 +241,6 @@ public class DepotService {
         return list;
     }
 
-    public List<Depot> findGiftByType(Integer type)throws Exception{
-        DepotExample example = new DepotExample();
-        example.createCriteria().andTypeEqualTo(type);
-        example.setOrderByClause("Sort");
-        List<Depot> list=null;
-        try{
-            list=  depotMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
-
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int updateIsDefault(Long depotId) throws Exception{
         int result=0;
@@ -309,16 +296,16 @@ public class DepotService {
                     if(StringUtil.isNotEmpty(depotStr)){
                         depotStr = depotStr.replaceAll("\\[", "").replaceAll("]", ",");
                         String[] depotArr = depotStr.split(",");
-                        for(String depotId: depotArr) {
-                            JSONObject item = new JSONObject();
-                            item.put("id", Long.parseLong(depotId));
-                            for (Depot depot : dataList) {
+                        for (Depot depot : dataList) {
+                            for(String depotId: depotArr) {
                                 if(depot.getId() == Long.parseLong(depotId)){
+                                    JSONObject item = new JSONObject();
+                                    item.put("id", depot.getId());
                                     item.put("depotName", depot.getName());
                                     item.put("isDefault", depot.getIsDefault());
+                                    arr.add(item);
                                 }
                             }
-                            arr.add(item);
                         }
                     }
                 }