fix: 任务中心-查看加scorePackageName

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -212,22 +212,31 @@ public class WmTaskController {
 			WmTask wmTask3 = new WmTask();
 			wmTask3.setScorePackageId(wmScorePackage.getId());
 			List<WmTask> wmTaskList3 = wmTaskMapper.selectListByIds(wmTask3);
+			// 回显积分包名称
+			wmTaskList3.forEach(task -> task.setScorePackageName(wmScorePackage.getScorePackageName()));
+
 			list.addAll(wmTaskList3);
-			List<String> ids2 = wmScorePackageList.stream().map(p -> p.getId()).collect(Collectors.toList());
-			for (String id : ids2) {
+
+			for (WmScorePackage subScorePackage : wmScorePackageList) {
 				WmScorePackage wmScorePackage1 = new WmScorePackage();
-				wmScorePackage1.setRelationScoreId(id);
+				wmScorePackage1.setRelationScoreId(subScorePackage.getId());
 				List<WmScorePackage> wmScorePackageList1 = wmScorePackageService.selectLists(wmScorePackage1);
 				WmTask wmTask1 = new WmTask();
-				wmTask1.setScorePackageId(id);
+				wmTask1.setScorePackageId(subScorePackage.getId());
 				List<WmTask> wmTaskList = wmTaskMapper.selectListByIds(wmTask1);
+				// 回显积分包名称
+				wmTaskList.forEach(task -> task.setScorePackageName(subScorePackage.getScorePackageName()));
+
 				List<String> ids3 = wmTaskList.stream().map(p -> p.getId()).collect(Collectors.toList());
 				List<String> ids4 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
 				if (wmScorePackageList1.size() > 0) {
-					for (String id1 : ids4) {
+					for (WmScorePackage subSubScorePackage : wmScorePackageList1) {
 						WmTask wmTask2 = new WmTask();
-						wmTask2.setScorePackageId(id1);
+						wmTask2.setScorePackageId(subSubScorePackage.getId());
 						List<WmTask> wmTaskList1 = wmTaskMapper.selectListByIds(wmTask2);
+						// 回显积分包名称
+						wmTaskList1.forEach(task -> task.setScorePackageName(subSubScorePackage.getScorePackageName()));
+
 						List<String> ids5 = wmTaskList1.stream().map(p -> p.getId()).collect(Collectors.toList());
 						for (String id2 : ids5) {
 							WmTask wmTaskList2 = wmTaskMapper.selectByRealFlag(Integer.parseInt(id2));
@@ -244,9 +253,15 @@ public class WmTaskController {
 			WmTask wmTask1 = new WmTask();
 			wmTask1.setScorePackageId(wmScorePackage.getId());
 			List<WmTask> wmTaskList1 = wmTaskMapper.selectListByIds(wmTask1);
+			// 回显积分包名称
+			wmTaskList1.forEach(task -> task.setScorePackageName(wmScorePackage.getScorePackageName()));
+
 			list.addAll(wmTaskList1);
 		}
 
+		if (CollUtil.isEmpty(list)) {
+			return R.ok(page);
+		}
 		// 查询task包含的所有userId
 		Set<String> taskUserIds = list.stream().map(WmTask::getTaskUserId).collect(Collectors.toSet());
 		List<SysUser> userList = sysUserService.listByIds(taskUserIds);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmTask.java

@@ -50,6 +50,12 @@ public class WmTask extends Model<WmTask> {
 
 	String scorePackageId;
 
+	/**
+	 * 积分包名称
+	 */
+	@TableField(exist = false)
+	private String scorePackageName;
+
 	String taskRuleId;
 
 	/**