diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c26d7aeb..98aea73c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -213,7 +213,7 @@ springdoc: group-configs: - group: 'default' paths-to-match: '/api/**' - packages-to-scan: com.ruoyi.cai + packages-to-scan: com.ruoyi.web.controller.cai # 防止XSS攻击 xss: diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java index be843cde..304774a8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java @@ -192,7 +192,7 @@ public class UserServiceImpl extends ServiceImpl implements Us if(user == null || user.getFinishStatus() == 1){ return; } - if(user.getCity() != null && user.getBirthday() != null && GenderEnum.NONE.getCode().equals(user.getGender())){ + if(user.getCity() != null && user.getBirthday() != null && !GenderEnum.NONE.getCode().equals(user.getGender())){ this.update(Wrappers.lambdaUpdate(User.class) .eq(User::getId,user.getId()) .set(User::getFinishStatus,1)); @@ -347,6 +347,9 @@ public class UserServiceImpl extends ServiceImpl implements Us if(user == null){ throw new ServiceException("用户不存在"); } + if(user.getInviteId() != null){ + throw new ServiceException("请先解绑后在绑定"); + } User inviteUser = this.getByUserCode(inviteUsercode); if(inviteUser == null){ throw new ServiceException("邀请人用户不存在");