Merge branch 'hotfix-20240411-editbigpackage'

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

@@ -2208,6 +2208,17 @@ public class WmScorePackageController {
 			return R.failed("积分包分值必须大于0");
 		}
 
+		// 校验修改后的积分包值 不能小于 已下发的下级包积分包值
+		List<WmScorePackage> subPackages = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
+				.eq(WmScorePackage::getRelationScoreId, wmScorePackage.getId())
+				.ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
+		if (CollUtil.isNotEmpty(subPackages)) {
+			int subPackgesScore = subPackages.stream().mapToInt(WmScorePackage::getScore).sum();
+			if (wmScorePackage.getScore() < subPackgesScore) {
+				return R.failed(String.format("该积分包已分配%s积分，修改后积分包值需大于该值", subPackgesScore));
+			}
+		}
+
 		wmScorePackage.setPackageType1("1");
 		wmScorePackage.setUpdateUser(SecurityUtils.getUser().getId());
 		wmScorePackage.setUpdateTime(LocalDateTime.now());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

@@ -808,6 +808,11 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				// 默认返回false，不触发发送mq
 				return false;
 			default:
+				// 已认证不发起
+				if (userSub.getCertStatus() != null
+						&& (userSub.getCertStatus().equals(1) || userSub.getCertStatus().equals(15))) {
+					return false;
+				}
 		}
 
 		// 默认发起认证