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 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 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 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 list = new ArrayList<>(); - List 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 collect = list.stream().map(Object::toString).collect(Collectors.toList()); - List 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 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