From e7dafbeb1e89b83722a30709d9cfcd65313863c9 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 9 Aug 2021 18:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/styles/index.scss         | 10 ++--
 .../views/system/user/change/dept/index.vue   | 51 +++++++++++--------
 .../system/controller/SysUserController.java  | 17 ++++---
 .../mybatis/system/SysUserMapper.xml          |  2 +-
 4 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss
index 7b9f52ba1..19dc701e2 100644
--- a/ruoyi-ui/src/assets/styles/index.scss
+++ b/ruoyi-ui/src/assets/styles/index.scss
@@ -254,8 +254,8 @@ li {
   }
 }
 
-.vue-treeselect__control {
-  height: 34px !important;
-  line-height: 34px;
-  overflow: hidden;
-}
\ No newline at end of file
+// .vue-treeselect__control {
+//   height: 34px !important;
+//   line-height: 34px;
+//   overflow: hidden;
+// }
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/user/change/dept/index.vue b/ruoyi-ui/src/views/system/user/change/dept/index.vue
index d18684b34..0b506f6d6 100644
--- a/ruoyi-ui/src/views/system/user/change/dept/index.vue
+++ b/ruoyi-ui/src/views/system/user/change/dept/index.vue
@@ -14,11 +14,17 @@
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
-                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }}</div>
+                <div class="pull-right" v-if="user.dept">
+                  {{ user.dept.deptName }}
+                </div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />选择部门
-                <div class="pull-right" v-for="item in deptsOptions" :key="item.deptId">
+                <div
+                  class="pull-right"
+                  v-for="item in deptsOptions"
+                  :key="item.deptId"
+                >
                   <input
                     type="radio"
                     name="dept"
@@ -30,8 +36,12 @@
                 </div>
               </li>
               <li class="list-group-item">
-                <el-button type="primary" size="mini" @click="submit">保存</el-button>
-                <el-button type="danger" size="mini" @click="close">关闭</el-button>
+                <el-button type="primary" size="mini" @click="submit"
+                  >保存</el-button
+                >
+                <el-button type="danger" size="mini" @click="close"
+                  >关闭</el-button
+                >
               </li>
             </ul>
           </div>
@@ -43,7 +53,7 @@
 
 <script>
 import { getUserProfile } from "@/api/system/user";
-import { getDeptsInfo,changeDept } from "@/api/system/dept";
+import { getDeptsInfo, changeDept } from "@/api/system/dept";
 
 export default {
   name: "changedept",
@@ -52,7 +62,7 @@ export default {
       checkedValue: null,
       oldValue: null,
       user: {},
-      deptsOptions: []
+      deptsOptions: [],
     };
   },
   created() {
@@ -61,7 +71,7 @@ export default {
   },
   methods: {
     getDepts() {
-      getDeptsInfo().then(response => {
+      getDeptsInfo().then((response) => {
         // console.log("school=" + response.total);
         // console.log( response);
         if (response.total <= 1) {
@@ -72,7 +82,7 @@ export default {
       });
     },
     getUser() {
-      getUserProfile().then(response => {
+      getUserProfile().then((response) => {
         this.user = response.data;
         this.checkedValue = response.data.dept.deptId;
         this.oldValue = response.data.dept.deptId;
@@ -84,23 +94,22 @@ export default {
         return;
       } else {
         //切换岗位
-        changeDept(this.checkedValue).then(
-            response => {
-              if (response.code === 200) {
-                this.msgSuccess(response.msg);
-                this.getUser();
-                this.getDepts();
-              } else {
-                this.msgError(response.msg);
-              }
-            }
-          )
+        changeDept(this.checkedValue).then((response) => {
+          if (response.code === 200) {
+            this.msgSuccess(response.msg);
+            this.getUser();
+            this.getDepts();
+            location.reload();
+          } else {
+            this.msgError(response.msg);
+          }
+        });
       }
     },
     close() {
       this.$store.dispatch("tagsView/delView", this.$route);
       this.$router.push({ path: "/index" });
-    }
-  }
+    },
+  },
 };
 </script>
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index b5466bd17..1ef1e8440 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -279,16 +279,17 @@ public class SysUserController extends BaseController {
 
         //先判断前端的roleids是否有变化
         boolean isPd = true;
-        if (schoolCommon.isSchool() == true) {
-            List<Integer> roleIdsOld = roleService.selectYeyRoleListByUserId(user.getUserId());
-            if (roleIdsOld != null && roleIdsOld.size() > 0) {
-                for (int i = 0; i < roleIdsOld.size(); i++) {
-                    if (roleIdsOld.get(i) == 100) {
-                        isPd = false;
-                    }
+//        if (schoolCommon.isSchool() == true) {
+        List<Integer> roleIdsOld = roleService.selectYeyRoleListByUserId(user.getUserId());
+        if (roleIdsOld != null && roleIdsOld.size() > 0) {
+            for (int i = 0; i < roleIdsOld.size(); i++) {
+                System.out.println(roleIdsOld.get(i) == 100);
+                if (roleIdsOld.get(i) == 100) {
+                    isPd = false;
                 }
             }
         }
+//        }
         if (isPd) {
             //判断当前学校有多少个幼儿园管理员 需求至多3个幼儿园管理员
             Long[] roleIds = user.getRoleIds();
@@ -307,7 +308,7 @@ public class SysUserController extends BaseController {
         }
 
         user.setPhonenumber(user.getUserName());
-        user.setEmail(user.getUserName()+"@benyi.com");
+        user.setEmail(user.getUserName() + "@benyi.com");
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }
diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
index 0c0681f79..ffda21894 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
@@ -251,7 +251,7 @@
  	</delete>
 
     <delete id="deleteUserByIds" parameterType="Long">
-        update sys_user set del_flag = '2' where user_id in
+        update sys_user set del_flag = '2',user_name=CONCAT('del-',user_name),phonenumber=CONCAT('del-',phonenumber),email=CONCAT('del-',email) where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
         </foreach>