Merge branch 'hotfix-20230912-signag' into temp-pre

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

@@ -4673,7 +4673,7 @@ public class ApiController {
 
 
 		boolean update = sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
-				.eq(SysUser::getIdCardNumber, queryUser.getIdCardNumber())
+				.eq(SysUser::getUsername, queryUser.getUsername())
 				.set(SysUser::getSignAgreement, JSONUtil.toJsonStr(signAgreementDTOList))
 				.set(SysUser::getUpdateTime, LocalDateTime.now()));
 
@@ -4691,10 +4691,13 @@ public class ApiController {
 		SysUser queryUser = sysUserService.getById(userId);
 		log.info("关闭年满60周岁提醒:userId={},idCardNumber={}", userId, queryUser.getIdCardNumber());
 
-		boolean update = sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
-				.eq(SysUser::getIdCardNumber, queryUser.getIdCardNumber())
-				.set(SysUser::getAgeReminder, Boolean.FALSE)
-				.set(SysUser::getUpdateTime, LocalDateTime.now()));
+		boolean update = false;
+		if (StrUtil.isNotBlank(queryUser.getIdCardNumber())) {
+			update = sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
+					.eq(SysUser::getIdCardNumber, queryUser.getIdCardNumber())
+					.set(SysUser::getAgeReminder, Boolean.FALSE)
+					.set(SysUser::getUpdateTime, LocalDateTime.now()));
+		}
 
 		return R.ok(update);
 	}