diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java index 4aed38fc..c5edc338 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java @@ -141,9 +141,9 @@ public class PortConfig { JSONObject data = jsonObject.getJSONObject("data"); JSONArray list = data.getJSONArray("list"); UserByPort userByPort = null; - for (int i = 0; i < list.size(); i++) { - userByPort = JSONObject.toJavaObject((JSON) list.get(i), UserByPort.class); - if(userByPort != null){ + for (Object o : list) { + userByPort = JSONObject.toJavaObject((JSON) o, UserByPort.class); + if (userByPort != null) { break; } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java index aedcbb1e..99269e8f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import javax.sound.sampled.Port; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; @@ -341,7 +342,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("".equals(s)) { continue; } - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), userToken); + UserByPort userByPort = PortConfig.findUserByPortByNumber(s); QyWxUid.append(userByPort.getWorkwechat()).append(","); } // 如果同意 @@ -511,7 +512,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 更新结果 map.put("id", mainId); map.put("reviewTime", DateUtil.DateTimeToTimeStamp(simpleTime)); - map.put("departmentManager", userToken.getId()); + map.put("departmentManager", userToken.getNumber()); stockTakingMapper.updateStockTaking(map); // 更新其他卡片 @@ -541,7 +542,7 @@ public class StockTakingServiceImpl implements StockTakingService { if("".equals(s)){ continue; } - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), null); + UserByPort userByPort = PortConfig.findUserByPortByNumber(s); QyWxUid.append(userByPort.getWorkwechat()).append(","); } String s = QyWxUid.toString(); @@ -589,7 +590,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("".equals(s)) { continue; } - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), userToken); + UserByPort userByPort = PortConfig.findUserByPortByNumber(s); QyWxUid.append(userByPort.getWorkwechat()).append(","); } @@ -1318,7 +1319,7 @@ public class StockTakingServiceImpl implements StockTakingService { map.put("state", 1); String simpleTime = DateUtil.getSimpleTime(new Date()); map.put("completeTime", DateUtil.DateTimeToTimeStamp(simpleTime)); - map.put("departmentManager", userByPort.getId()); + map.put("departmentManager", userByPort.getNumber()); stockTakingMapper.updateStockTaking(map); // 开启一个线程用于发送抄送信息给负责人 @@ -1335,7 +1336,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("".equals(s)) { continue; } - UserByPort userByPort1 = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), null); + UserByPort userByPort1 = PortConfig.findUserByPortByNumber(s); QyWxUid.append(userByPort1.getWorkwechat()).append(","); } String s = QyWxUid.toString(); @@ -1398,7 +1399,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("".equals(s)) { continue; } - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), null); + UserByPort userByPort = PortConfig.findUserByPortByNumber(s); QyWxUid.append(userByPort.getWorkwechat()).append(","); } if ("2".equals(spStatus)) { @@ -1572,7 +1573,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 更新结果 map.put("id", mainId); map.put("reviewTime", DateUtil.DateTimeToTimeStamp(simpleTime)); - map.put("departmentManager", approver_user.getId()); + map.put("departmentManager", approver_user.getNumber()); stockTakingMapper.updateStockTaking(map); return result; } else { @@ -2675,7 +2676,7 @@ public class StockTakingServiceImpl implements StockTakingService { map.put("departmentManagerState", departmentManagerState); map.put("reviewTime", DateUtil.DateTimeToTimeStamp(simpleTime)); - map.put("departmentManager", userByPort.getId()); + map.put("departmentManager", userByPort.getNumber()); stockTakingMapper.updateStockTaking(map); } return result;