2022年12月29日16:10:03

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -201,9 +201,11 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
 			StringBuilder boxTypeNumber = new StringBuilder();
 			List<String> boxType = repairItemList.stream().map(RepairItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
-				List<RepairItem> boxTypeSize = repairItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
-				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
+					List<RepairItem> boxTypeSize = repairItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
+						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+					}
 				}
 			}
 			repair.setBoxTypeNumber(boxTypeNumber.toString());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -215,9 +215,11 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			StringBuilder boxTypeNumber = new StringBuilder();
 			List<String> boxType = tradingBoxItemList.stream().map(TradingBoxItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
-				List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
-				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
+					List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
+						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+					}
 				}
 			}
 			tradingBox.setBoxTypeNumber(boxTypeNumber.toString());
@@ -451,9 +453,11 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			StringBuilder boxTypeNumber = new StringBuilder();
 			List<String> boxType = tradingBoxItemList.stream().map(TradingBoxItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
-				List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
-				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
+					List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
+						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+					}
 				}
 			}
 			tradingBox.setBoxTypeNumber(boxTypeNumber.toString());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -207,9 +207,11 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			StringBuilder boxTypeNumber = new StringBuilder();
 			List<String> boxType = transportItemList.stream().map(TransportItem::getBoxType).distinct().collect(Collectors.toList());
 			for (String boxType_ : boxType) {
-				List<TransportItem> boxTypeSize = transportItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
-				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+				if (ObjectUtils.isNotNull(boxType) && boxType.size() > 0) {
+					List<TransportItem> boxTypeSize = transportItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
+					if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
+						boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
+					}
 				}
 			}
 			transport.setBoxTypeNumber(boxTypeNumber.toString());

blade-service/blade-client/src/main/java/org/springblade/client/wechat/controller/WechatController.java

@@ -56,7 +56,7 @@ public class WechatController {
 													 @RequestParam("telCode") String telCode,
 													 @RequestParam("encryptedData") String encryptedData,
 													 @RequestParam("iv") String iv,
-													 @RequestParam("applets_id") String applets_id)
+													 @RequestParam(value = "applets_id",required = false) String applets_id)
 		throws IOException {
 		if (StringUtil.isBlank(loginCode)) {
 			throw new SecurityException("登录code获取失败");