From 31189da79e0d2e9c27d2c1f3585c501cb5c1b7af Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Fri, 12 Jun 2020 22:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=EF=BC=8C=E8=A7=92=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=B9=8B=E5=89=8D=E7=9A=84=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=202.=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=EF=BC=8C=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=BF=98=E6=98=AF=E4=B9=8B=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=203.=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=B2=97=E4=BD=8D=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=B2=97=E4=BD=8D=E8=BF=98=E6=98=AF=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=E5=B2=97=E4=BD=8D=204.=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E8=BF=98=E6=98=AF=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/rest/JobController.java    |  1 +
 .../service/impl/SysUserServiceImpl.java      | 30 ++++++++++++-------
 .../main/resources/config/application-dev.yml |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java
index c41b2276..eccd202c 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java
@@ -91,6 +91,7 @@ public class JobController {
     @PreAuthorize("@el.check('admin','job:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody Job resources){
         //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
+        resources.setDeptId(resources.getDept().getId());
         jobService.saveOrUpdate(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
index 46336821..3d8bfb58 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
@@ -259,6 +259,25 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
         if(user2!=null&&!user.getId().equals(user2.getId())){
             throw new EntityExistException(User.class,"email",resources.getEmail());
         }
+        user.setUsername(resources.getUsername());
+        user.setEmail(resources.getEmail());
+        user.setEnabled(resources.getEnabled());
+        user.setDeptId(resources.getDept().getId());
+        user.setJobId(resources.getJob().getId());
+        user.setPhone(resources.getPhone());
+        user.setNickName(resources.getNickName());
+        user.setSex(resources.getSex());
+        boolean result = this.saveOrUpdate(user);
+        usersRolesService.lambdaUpdate().eq(UsersRoles ::getUserId,resources.getId()).remove();
+        UsersRoles usersRoles = new UsersRoles();
+        usersRoles.setUserId(resources.getId());
+        Set<Role> set = resources.getRoles();
+        for (Role roleIds : set ) {
+            usersRoles.setRoleId(roleIds.getId());
+        }
+        if (result) {
+            usersRolesService.save(usersRoles);
+        }
 
         // 如果用户的角色改变了，需要手动清理下缓存
         if (!resources.getRoles().equals(user.getRoles())) {
@@ -267,17 +286,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
             key = "role::findByUsers_Id:" + user.getId();
             redisUtils.del(key);
         }
-
-        user.setUsername(resources.getUsername());
-        user.setEmail(resources.getEmail());
-        user.setEnabled(resources.getEnabled());
-        user.setRoles(resources.getRoles());
-        user.setDept(resources.getDept());
-        user.setJob(resources.getJob());
-        user.setPhone(resources.getPhone());
-        user.setNickName(resources.getNickName());
-        user.setSex(resources.getSex());
-        this.saveOrUpdate(user);
     }
 
     @Override
diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml
index aee93f77..47db99b6 100644
--- a/yshop-system/src/main/resources/config/application-dev.yml
+++ b/yshop-system/src/main/resources/config/application-dev.yml
@@ -41,7 +41,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: root
+    password:
     #连接超时时间
     timeout: 5000