From 4e47fb64a5fe0f3cb8117a7a1fe0eda096cbf1b2 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 25 May 2023 14:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=AF=8F=E5=A4=A9=E5=87=8C=E6=99=A8=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E5=87=BA=E5=BA=93=E6=95=B0=E9=87=8F=E4=B8=BA=E9=9B=B6?=
 =?UTF-8?q?=E7=9A=84=E5=87=BA=E5=BA=93=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DepositoryRecordServiceImpl.java     | 10 +++----
 .../depository_manage/OtherTest.java          | 27 ++++++-------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index f00220a9..04eb370d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -230,8 +230,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     public Integer insertApplicationOutRecord(Map<String, Object> map, UserByPort userToken, String userKey, String token) {
         String placeId = "";
         Object temp = map.get("placeId");
-        String depositoryId = map.get("depositoryId").toString();
-        if (depositoryId == null || "".equals(depositoryId)) {
+        Object depositoryId = map.get("depositoryId");
+        if (depositoryId == null || "".equals(depositoryId.toString())) {
             map.put("flagForOpenDepository", 1);
             map.remove("depositoryId");
         } else {
@@ -919,16 +919,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     public Integer insertApplicationOutMin(Map<String, Object> map) {
         // 获取当前出库库存id
         Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
-        String depositoryId = map.get("depositoryId").toString();
+        Object depositoryId = map.get("depositoryId");
         // 获取当前出库库存记录
         Inventory inventoryById = materialMapper.findInventoryById(mid);
-        if (depositoryId == null || "".equals(depositoryId)) {
+        if (depositoryId == null || "".equals(depositoryId.toString())) {
             map.put("depositoryId", inventoryById.getDepositoryId());
         } else {
             // 如果选择了仓库
             Map<String, Object> paramForInventory = new HashMap<>();
             paramForInventory.put("mid", inventoryById.getMid());
-            paramForInventory.put("did", depositoryId);
+            paramForInventory.put("did", depositoryId.toString());
             inventoryById = materialMapper.findInventoryByMidAndDid(paramForInventory);
         }
 
diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java
index 50efd030..ca180cc6 100644
--- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java
+++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java
@@ -35,8 +35,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@RunWith(SpringRunner.class)
 public class OtherTest {
 
     @Autowired
@@ -119,23 +117,14 @@ public class OtherTest {
 
     @Test
     public void someTest(){
-        List<Object> list = new ArrayList<>();
-        List<Object> list1 = new ArrayList<>();
-        list1.add(1);
-        list1.add(2);
-        list1.add(3);
-        list1.add(4);
-        list.add(4L);
-        list.add(5L);
-        list.add(6L);
-        list.add(7L);
-        list.add(1L);
-        List<String> collect = list.stream().map(Object::toString).collect(Collectors.toList());
-        List<String> collect1 = list1.stream().map(Object::toString).collect(Collectors.toList());
-        System.out.println(collect);
-        collect.removeAll(collect1);
-        System.out.println(collect);
-        System.out.println(collect1);
+        Map<String,Object> map = new HashMap<>();
+        map.put("a","");
+        Object a = map.get("a");
+        if(a == null || "".equals(a)){
+            System.out.println("a1");
+        }else{
+            System.out.println(ObjectFormatUtil.toInteger(a));
+        }
     }
 
     @Test