fix: 用户管理删除组织会闪现0(null)

fit2cloud-chenyw · fit2cloud-chenyw · commit 256c0efe6baa · 2021-06-24T18:34:05.000+08:00
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -30,6 +30,7 @@
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -117,6 +118,7 @@ public int update(SysUserCreateRequest request) {
         user.setUpdateTime(now);
         deleteUserRoles(user.getUserId());//先删除用户角色关联
         saveUserRoles(user.getUserId(), request.getRoleIds());//再插入角色关联
+        if (ObjectUtils.isEmpty(user.getDeptId())) user.setDeptId(0L);
         return sysUserMapper.updateByPrimaryKeySelective(user);
     }
 
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
@@ -106,7 +106,7 @@ export default {
       const { meta, path } = route
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
-        return meta.activeMenu
+        // return meta.activeMenu
       }
       // 如果是首页，首页高亮
       if (path === '/panel') {
diff --git a/frontend/src/views/link/pwd/index.vue b/frontend/src/views/link/pwd/index.vue
@@ -5,7 +5,8 @@
 
         <div class="span-header">
           <div class="bi-text">
-            {{ $t('pblink.key_pwd') }}
+            <span style="text-align: center;">{{ $t('pblink.key_pwd') }}
+            </span>
           </div>
         </div>
 
diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
@@ -288,7 +288,7 @@ export default {
     save() {
       this.$refs.createUserForm.validate(valid => {
         if (valid) {
-          !this.form.deptId && (this.form.deptId = 0)
+          // !this.form.deptId && (this.form.deptId = 0)
           const method = this.formType === 'add' ? addUser : editUser
           method(this.form).then(res => {
             this.$success(this.$t('commons.save_success'))

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export default {`
`106`	`106`	`const { meta, path } = route`
`107`	`107`	`// if set path, the sidebar will highlight the path you set`
`108`	`108`	`if (meta.activeMenu) {`
`109`		`- return meta.activeMenu`
	`109`	`+ // return meta.activeMenu`
`110`	`110`	`}`
`111`	`111`	`// 如果是首页，首页高亮`
`112`	`112`	`if (path === '/panel') {`