Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysUserDeptMapper.java

@@ -18,6 +18,8 @@ import java.util.List;
 @Component
 public interface SysUserDeptMapper extends MyMapper<SysUserDept> {
 
+    void updateDept(SysUserDeptDTO sysUserDeptDTOer);
+
     String selectDeptIdByUserId(String userId);
 
     /**

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysUserMapper.java

@@ -20,6 +20,8 @@ import java.util.List;
 @Component(value = "sysUserMapper")
 public interface SysUserMapper extends MyMapper<SysUser> {
 
+    void updateUserInfo(SysUserDTO sysUserDTO);
+
     /**
      * 用户查询，包含用户
      *

platform-dao/src/main/resources/mapper/upms/SysUserDeptMapper.xml

@@ -80,4 +80,10 @@
         select dept_id from t_sys_user_dept
         where user_id=#{id}
     </select>
+
+    <select id="updateDept" parameterType="com.platform.dao.dto.upms.SysUserDeptDTO">
+        update t_sys_user_dept
+        set dept_id=#{deptId}
+        where user_id=#{userId}
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -19,6 +19,7 @@ import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.entity.upms.SysMenu;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.util.TreeUtil;
@@ -37,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -348,6 +350,29 @@ public class SysUserController {
         return new R<>(sysUserService.updateAvatar(avatar));
     }
 
+    /**
+     * 修改用户信息
+     *
+     * @param sysUserDTO :
+     * @return R
+     */
+    @SysLog("修改用户信息")
+    @PutMapping("/info")
+    @Transactional(rollbackFor = Exception.class)
+    public R updateUserInfo(@RequestBody SysUserDTO sysUserDTO) {
+        String avatar = sysUserDTO.getAvatar();
+        if (StringUtils.isBlank(avatar)) {
+            return R.error(ResultCode.PARAM_INVALID);
+        }
+//        return new R<>(sysUserService.updateAvatar(avatar));
+        sysUserService.updateUserInfo(sysUserDTO);
+        SysUserDeptDTO sysUserDeptDTO=new SysUserDeptDTO();
+        sysUserDeptDTO.setUserId(SecurityUtils.getUserInfo().getUserId());
+        sysUserDeptDTO.setDeptId(sysUserDTO.getDeptId());
+        sysUserDeptService.updateDept(sysUserDeptDTO);
+        return new R<>();
+    }
+
     /**
      * 重置密码
      *

platform-service/src/main/java/com/platform/service/upms/SysUserDeptService.java

@@ -17,6 +17,8 @@ import java.util.List;
  */
 public interface SysUserDeptService extends IBaseService<SysUserDept, SysUserDeptDTO> {
 
+    void updateDept(SysUserDeptDTO sysUserDeptDTO);
+
     /**
      * 用户区域
      *

platform-service/src/main/java/com/platform/service/upms/SysUserService.java

@@ -22,6 +22,10 @@ import java.util.List;
  */
 public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
 
+    void updateUserInfo(SysUserDTO sysUserDTO);
+
+
+
     /**
      * 通过用户名称查询系统用户
      *

platform-service/src/main/java/com/platform/service/upms/impl/SysUserDeptServiceImpl.java

@@ -35,6 +35,11 @@ public class SysUserDeptServiceImpl extends BaseServiceImpl<SysUserDeptMapper, S
 
     private final SysDeptMapper sysDeptMapper;
 
+    @Override
+    public void updateDept(SysUserDeptDTO sysUserDeptDTO) {
+        mapper.updateDept(sysUserDeptDTO);
+    }
+
     @Override
     public void saveUserDepts(String userId, List<String> deptIds) {
         List<SysUserDept> sysDeptUserList = ListUtils.newArrayList(deptIds.size());

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.platform.service.upms.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.cache.DictCache;
 import com.platform.common.constant.CommonConstants;
@@ -101,6 +102,13 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     @Value("${security.oauth2.client.client-secret}")
     private String clientSecret;
 
+    @Override
+    public void updateUserInfo(SysUserDTO sysUserDTO) {
+        sysUserDTO.setUserId(SecurityUtils.getUserInfo().getUserId());
+        SysUser sysUser=BeanConverterUtil.copyObjectProperties(sysUserDTO,SysUser.class);
+        updateUser(sysUser);
+    }
+
     @Override
     @Master
     @Transactional(rollbackFor = Exception.class)