|
@@ -21,9 +21,11 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
|
|
import com.ruoyi.common.utils.file.MimeTypeUtils;
|
|
import com.ruoyi.common.utils.file.MimeTypeUtils;
|
|
import com.ruoyi.framework.web.service.TokenService;
|
|
import com.ruoyi.framework.web.service.TokenService;
|
|
import com.ruoyi.generator.domain.Community.CommunityUserBlock;
|
|
import com.ruoyi.generator.domain.Community.CommunityUserBlock;
|
|
|
|
+import com.ruoyi.generator.domain.Community.CommunityUserCircle;
|
|
import com.ruoyi.generator.domain.Community.CommunityUserInfo;
|
|
import com.ruoyi.generator.domain.Community.CommunityUserInfo;
|
|
import com.ruoyi.generator.mapper.community.CommunityUserInfoMapper;
|
|
import com.ruoyi.generator.mapper.community.CommunityUserInfoMapper;
|
|
import com.ruoyi.generator.service.ICommunityUserBlockService;
|
|
import com.ruoyi.generator.service.ICommunityUserBlockService;
|
|
|
|
+import com.ruoyi.system.mapper.SysUserMapper;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -31,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
+import java.util.List;
|
|
import java.util.Objects;
|
|
import java.util.Objects;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -54,6 +57,8 @@ public class SysProfileController extends BaseController {
|
|
private ICommunityUserBlockService communityUserBlockService;
|
|
private ICommunityUserBlockService communityUserBlockService;
|
|
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private SysUserMapper userMapper;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private RedisCache redisCache;
|
|
private RedisCache redisCache;
|
|
@@ -90,6 +95,21 @@ public class SysProfileController extends BaseController {
|
|
if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser)) {
|
|
if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser)) {
|
|
return error("修改用户'" + loginUser.getUsername() + "'失败,邮箱账号已存在");
|
|
return error("修改用户'" + loginUser.getUsername() + "'失败,邮箱账号已存在");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ //查询用户是否还有修改性别的次数
|
|
|
|
+ SysUser sysUsers = userMapper.selectOne(
|
|
|
|
+ new QueryWrapper<SysUser>()
|
|
|
|
+ .select("sex", "is_sex") // 选择 sex 和 is_sex 字段
|
|
|
|
+ .eq("user_id", currentUser.getUserId())
|
|
|
|
+
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ if (sysUsers.getIsSex() && !currentUser.getSex().equals(sysUsers.getSex())) {
|
|
|
|
+ return error("不允许修改用户'" + loginUser.getUsername() + "'性别");
|
|
|
|
+ } else if (currentUser.getSex().equals(sysUsers.getSex())) {
|
|
|
|
+ currentUser.setSex(null);
|
|
|
|
+ }
|
|
|
|
+
|
|
if (userService.updateUserProfile(currentUser) > 0) {
|
|
if (userService.updateUserProfile(currentUser) > 0) {
|
|
CommunityUserInfo communityUserInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", currentUser.getUserId()));
|
|
CommunityUserInfo communityUserInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", currentUser.getUserId()));
|
|
communityUserInfo.setProfile(currentUser.getProfile());
|
|
communityUserInfo.setProfile(currentUser.getProfile());
|