zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复重载校验方法定义及使用错误

Browse Source
This commit is contained in:
Charles7c 2023-10-20 00:24:05 +08:00
parent efe455736c
commit a1ccc421c4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java
View File

@ -87,7 +87,7 @@ public class CheckUtils extends Validator {
} }
/** /**
* 如果不为空，抛出异常 * 如果存在，抛出异常
* *
* @param obj * @param obj
* 被检测的对象 * 被检测的对象
@ -98,7 +98,7 @@ public class CheckUtils extends Validator {
* @param fieldValue * @param fieldValue
* 字段值 * 字段值
*/ */
public static void throwIfNotNull(Object obj, String entityName, String fieldName, Object fieldValue) { public static void throwIfExists(Object obj, String entityName, String fieldName, Object fieldValue) {
String message = String.format("%s 为 [%s] 的 %s 记录已存在", fieldName, fieldValue, entityName); String message = String.format("%s 为 [%s] 的 %s 记录已存在", fieldName, fieldValue, entityName);
throwIfNotNull(obj, message, EXCEPTION_TYPE); throwIfNotNull(obj, message, EXCEPTION_TYPE);
} }

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserSocialServiceImpl.java
View File

@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import top.charles7c.cnadmin.common.enums.SocialSourceEnum;
import top.charles7c.cnadmin.common.util.validate.CheckUtils; import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.UserSocialMapper; import top.charles7c.cnadmin.system.mapper.UserSocialMapper;
import top.charles7c.cnadmin.system.model.entity.UserSocialDO; import top.charles7c.cnadmin.system.model.entity.UserSocialDO;
@ -76,9 +77,10 @@ public class UserSocialServiceImpl implements UserSocialService {
String openId = authUser.getUuid(); String openId = authUser.getUuid();
List<UserSocialDO> userSocialList = this.listByUserId(userId); List<UserSocialDO> userSocialList = this.listByUserId(userId);
Set<String> boundSocialSet = userSocialList.stream().map(UserSocialDO::getSource).collect(Collectors.toSet()); Set<String> boundSocialSet = userSocialList.stream().map(UserSocialDO::getSource).collect(Collectors.toSet());
CheckUtils.throwIf(boundSocialSet.contains(source), "您已经绑定过了 [{}] 平台，请先解绑"); String description = SocialSourceEnum.valueOf(source).getDescription();
CheckUtils.throwIf(boundSocialSet.contains(source), "您已经绑定过了 [{}] 平台，请先解绑", description);
UserSocialDO userSocial = this.getBySourceAndOpenId(source, openId); UserSocialDO userSocial = this.getBySourceAndOpenId(source, openId);
CheckUtils.throwIfNotNull(userSocial, "[{}] 平台账号 [{}] 已被其他用户绑定", source, authUser.getUsername()); CheckUtils.throwIfNotNull(userSocial, "[{}] 平台账号 [{}] 已被其他用户绑定", description, authUser.getUsername());
userSocial = new UserSocialDO(); userSocial = new UserSocialDO();
userSocial.setUserId(userId); userSocial.setUserId(userId);
userSocial.setSource(source); userSocial.setSource(source);