feat: 廉洁协议/满60周岁提醒 统一按身份证区分

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

@@ -4647,35 +4647,32 @@ public class ApiController {
 	public R<Boolean> signAgreement(@Validated @RequestBody SignAgreementDTO signAgreementDTO) {
 		log.info("小程序签署协议请求:{}", signAgreementDTO);
 
-		String username = SecurityUtils.getUser().getUsername();
-
-		List<SysUser> users = sysUserService.list(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, username));
+		Integer userId = SecurityUtils.getUser().getId();
+		SysUser queryUser = sysUserService.getById(userId);
 
-		users.forEach(queryUser -> {
-			List<Object> signAgreementDTOList = new ArrayList<>();
-			if (StrUtil.isBlank(queryUser.getSignAgreement())) {
-				signAgreementDTOList.add(signAgreementDTO);
-			} else {
-				JSONArray agreements = JSONUtil.parseArray(queryUser.getSignAgreement());
-				// 如果已存在该协议,则不再重复保存
-				boolean anyMatch = agreements.stream()
-						.map(o -> BeanUtil.toBean(o, SignAgreementDTO.class))
-						.anyMatch(dto -> SignAgreementDTO.SignAgreementType.HONEST_AGREEMENT.equals(dto.getAgreementType()));
-				if (anyMatch) {
-					return;
-				}
-				signAgreementDTOList.add(signAgreementDTO);
-				signAgreementDTOList.addAll(agreements);
+		List<Object> signAgreementDTOList = new ArrayList<>();
+		if (StrUtil.isBlank(queryUser.getSignAgreement())) {
+			signAgreementDTOList.add(signAgreementDTO);
+		} else {
+			JSONArray agreements = JSONUtil.parseArray(queryUser.getSignAgreement());
+			signAgreementDTOList.addAll(agreements);
+			// 如果已存在该协议,则不再重复保存
+			boolean anyMatch = agreements.stream()
+					.map(o -> BeanUtil.toBean(o, SignAgreementDTO.class))
+					.anyMatch(dto -> SignAgreementDTO.SignAgreementType.HONEST_AGREEMENT.equals(dto.getAgreementType()));
+			if (anyMatch) {
+				return R.ok();
 			}
+			signAgreementDTOList.add(signAgreementDTO);
+		}
 
-			SysUser user = new SysUser();
-			user.setUserId(queryUser.getUserId());
-			user.setSignAgreement(JSONUtil.toJsonStr(signAgreementDTOList));
-			user.setUpdateTime(LocalDateTime.now());
-			sysUserService.updateById(user);
-		});
 
-		return R.ok();
+		boolean update = sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
+				.eq(SysUser::getIdCardNumber, queryUser.getIdCardNumber())
+				.set(SysUser::getSignAgreement, JSONUtil.toJsonStr(signAgreementDTOList))
+				.set(SysUser::getUpdateTime, LocalDateTime.now()));
+
+		return R.ok(update);
 	}
 
 	/**
@@ -4686,13 +4683,14 @@ public class ApiController {
 	@PostMapping("/stop-sixtyyearsold-reminder")
 	public R<Boolean> stopSixtyYearsOldReminder() {
 		Integer userId = SecurityUtils.getUser().getId();
-		log.info("关闭年满60周岁提醒:userId={}", userId);
+		SysUser queryUser = sysUserService.getById(userId);
+		log.info("关闭年满60周岁提醒:userId={},idCardNumber={}", userId, queryUser.getIdCardNumber());
 
-		SysUser user = new SysUser();
-		user.setUserId(userId);
-		user.setAgeReminder(Boolean.FALSE);
-		user.setUpdateTime(LocalDateTime.now());
+		boolean update = sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
+				.eq(SysUser::getIdCardNumber, queryUser.getIdCardNumber())
+				.set(SysUser::getAgeReminder, Boolean.FALSE)
+				.set(SysUser::getUpdateTime, LocalDateTime.now()));
 
-		return R.ok(sysUserService.updateById(user));
+		return R.ok(update);
 	}
 }