Merge branch 'feat-20230829-newtasktypes' into temp-pre

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

@@ -1965,17 +1965,15 @@ public class WmScorePackageController {
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				} else if (!"".equals(wmScorePackage.getRelationScoreId()) && sysDept1.getLevel() == 3) {
 					wmScoreTaskType.setScoreId(wmScorePackage.getId());
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScoreTaskType.getScoreId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				}
 			}
+			wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
+			wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 		}
 		if (isAnswer) {
 
@@ -2628,17 +2626,15 @@ public class WmScorePackageController {
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				} else {
 					wmScoreTaskType.setScoreId(wmScorePackage.getId());
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScoreTaskType.getScoreId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				}
 			}
+			wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
+			wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 		}
 
 		// 查询原积分包值