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 @@
所属部门
- {{ user.dept.deptName }}
+
+ {{ user.dept.deptName }}
+
选择部门
-
+
- 保存
- 关闭
+ 保存
+ 关闭
@@ -43,7 +53,7 @@
\ 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
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 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 @@
- 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
#{userId}