Browse Source

fix: sqlin空修复

李学松 2 năm trước cách đây
mục cha
commit
f7a7cf7da5

+ 54 - 52
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -350,62 +350,64 @@ public class ApiController {
 						query.setEnableFlag("0");
 
 						List<WmScorePackageStatus> statusList = wmScorePackageStatusService.list(Wrappers.lambdaQuery(query));
-						Set<String> scoreIds = statusList.stream()
-								.map(WmScorePackageStatus::getPackageId).collect(Collectors.toSet());
-						// 批量查询积分包
-						List<WmScorePackage> wmScorePackages = wmScorePackageService.listByIds(scoreIds);
-						Map<String, WmScorePackage> scorePackageMap = wmScorePackages.stream()
-								.collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
-						// 批量查询scoreTaskType
-						List<Map<String, Object>> scoreTaskTypeCountList = wmScoreTaskTypeMapper.countByScoreId(taskTypeId, scoreIds);
-						Map<String, Integer> scoreTaskTypeCountMap = scoreTaskTypeCountList.stream()
-								.collect(Collectors.toMap(o -> String.valueOf(o.get("score_id")), o -> Integer.parseInt(String.valueOf(o.get("count")))));
-
-						for (WmScorePackageStatus item : statusList) {
-							WmScorePackage wmScorePackage = scorePackageMap.get(item.getPackageId());
-							if (null != wmScorePackage) {
-								if ("0".equals(wmScorePackage.getTaskAddFlag())) {
-									continue;
-								}
-								if ("1".equals(wmScorePackage.getEnableFlag())) {
-									continue;
-								}
-								if ("2".equals(wmScorePackage.getPackageType2())) {
-									continue;
-								}
-
-								if ("28".equals(taskTypeId)) {
-									if ("3".equals(wmScorePackage.getPackageType1())) {
-										Map<String, Object> map = new HashMap<>();
-										map.put("label", wmScorePackage.getScorePackageName());
-										map.put("value", wmScorePackage.getId());
-										String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage
-												.getDrugProducerList());
-										map.put("drugProducer", drugProducer);
-										listMap.add(map);
+						if (CollUtil.isNotEmpty(statusList)) {
+							Set<String> scoreIds = statusList.stream()
+									.map(WmScorePackageStatus::getPackageId).collect(Collectors.toSet());
+							// 批量查询积分包
+							List<WmScorePackage> wmScorePackages = wmScorePackageService.listByIds(scoreIds);
+							Map<String, WmScorePackage> scorePackageMap = wmScorePackages.stream()
+									.collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
+							// 批量查询scoreTaskType
+							List<Map<String, Object>> scoreTaskTypeCountList = wmScoreTaskTypeMapper.countByScoreId(taskTypeId, scoreIds);
+							Map<String, Integer> scoreTaskTypeCountMap = scoreTaskTypeCountList.stream()
+									.collect(Collectors.toMap(o -> String.valueOf(o.get("score_id")), o -> Integer.parseInt(String.valueOf(o.get("count")))));
+
+							for (WmScorePackageStatus item : statusList) {
+								WmScorePackage wmScorePackage = scorePackageMap.get(item.getPackageId());
+								if (null != wmScorePackage) {
+									if ("0".equals(wmScorePackage.getTaskAddFlag())) {
+										continue;
 									}
-
-								} else {
-									if ("3".equals(wmScorePackage.getPackageType1())) {
+									if ("1".equals(wmScorePackage.getEnableFlag())) {
+										continue;
+									}
+									if ("2".equals(wmScorePackage.getPackageType2())) {
 										continue;
 									}
-									/**
-									 * 过滤有效任务类型
-									 */
-									WmScoreTaskType taskType = new WmScoreTaskType();
-									taskType.setTaskTypeId(taskTypeId);
-									taskType.setScoreId(wmScorePackage.getId());
-
-									int total = scoreTaskTypeCountMap.getOrDefault(wmScorePackage.getId(), 0);
 
-									if (total != 0) {
-										Map<String, Object> map = new HashMap<>();
-										map.put("label", wmScorePackage.getScorePackageName());
-										map.put("value", wmScorePackage.getId());
-										String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage
-												.getDrugProducerList());
-										map.put("drugProducer", drugProducer);
-										listMap.add(map);
+									if ("28".equals(taskTypeId)) {
+										if ("3".equals(wmScorePackage.getPackageType1())) {
+											Map<String, Object> map = new HashMap<>();
+											map.put("label", wmScorePackage.getScorePackageName());
+											map.put("value", wmScorePackage.getId());
+											String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage
+													.getDrugProducerList());
+											map.put("drugProducer", drugProducer);
+											listMap.add(map);
+										}
+
+									} else {
+										if ("3".equals(wmScorePackage.getPackageType1())) {
+											continue;
+										}
+										/**
+										 * 过滤有效任务类型
+										 */
+										WmScoreTaskType taskType = new WmScoreTaskType();
+										taskType.setTaskTypeId(taskTypeId);
+										taskType.setScoreId(wmScorePackage.getId());
+
+										int total = scoreTaskTypeCountMap.getOrDefault(wmScorePackage.getId(), 0);
+
+										if (total != 0) {
+											Map<String, Object> map = new HashMap<>();
+											map.put("label", wmScorePackage.getScorePackageName());
+											map.put("value", wmScorePackage.getId());
+											String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage
+													.getDrugProducerList());
+											map.put("drugProducer", drugProducer);
+											listMap.add(map);
+										}
 									}
 								}
 							}