123

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java

@@ -54,6 +54,8 @@ public class CurrentUserManager {
     private ImUserRefClient userClient;
     @Autowired
     private CitysService citysService;
+    @Autowired
+    private CaiLoginManager loginManager;
 
     public CurrentUserInfoVo currentInfo() {
         Long userId = LoginHelper.getUserId();
@@ -142,9 +144,6 @@ public class CurrentUserManager {
         return true;
     }
 
-    @Autowired
-    private CaiLoginManager loginManager;
-
     public boolean userUpdate(UserUpdateReq res) {
         res.setUserId(LoginHelper.getUserId());
         User user = userService.getById(res.getUserId());
@@ -179,15 +178,20 @@ public class CurrentUserManager {
             if(user.getGender() != 0 && !user.getGender().equals(res.getGender())){
                 throw new ServiceException("性别不可以修改");
             }
+            String cosDomain = systemConfigManager.getSystemConfig(SystemConfigEnum.COS_DOMAIN);
             update.set(User::getGender,genderEnum.getCode());
             update.set(User::getAvatar,genderEnum.getDefaultAvatar());
+            uinfoReq.setGender(genderEnum.getCode()+"");
+            uinfoReq.setIcon(cosDomain + genderEnum.getDefaultAvatar());
+            updateFlag=true;
+            updateYunxin=true;
         }
         if(res.getCityId() != null){
             update.set(User::getCityId,res.getCityId());
             update.set(User::getCity,citysService.getByCityId(res.getCityId()));
             updateFlag=true;
         }
-        if(StringUtils.isNotEmpty(res.getAvatar())){
+        /*if(StringUtils.isNotEmpty(res.getAvatar())){
             if(!GenderEnum.checkDefaultAvatar(res.getAvatar())){
                 update.set(User::getAvatar,res.getAvatar());
                 update.set(User::getAvatarState,1);
@@ -195,7 +199,7 @@ public class CurrentUserManager {
 //            updateYunxin=true;
                 updateFlag=true;
             }
-        }
+        }*/
         if(updateFlag){
             boolean flag = userService.update(update);
             if(flag){