fix: 部分修复

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java

@@ -1,6 +1,5 @@
 package org.nl.system.service.dept.dao;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java

@@ -1,12 +1,7 @@
 package org.nl.system.service.dept.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -18,8 +13,6 @@ import org.nl.modules.system.domain.vo.DeptVo;
 import org.nl.modules.system.service.dto.DeptTree;
 import org.nl.modules.system.util.CopyUtil;
 import org.nl.modules.tools.IdUtil;
-import org.nl.modules.wql.core.bean.ResultBean;
-import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.system.service.dept.ISysDeptService;
 import org.nl.system.service.dept.dao.SysDept;
 import org.nl.system.service.dept.dao.mapper.SysDeptMapper;
@@ -28,10 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+
 import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java

@@ -79,4 +79,10 @@ public interface ISysDictService extends IService<Dict> {
      * @param id
      */
     void deleteDetail(String id);
+
+    /**
+     * 查询所有字典信息
+     * @return
+     */
+    List<Dict> queryAll();
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java

@@ -182,4 +182,12 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
         sysDictMapper.deleteById(id);
     }
 
+    @Override
+    public List<Dict> queryAll() {
+        return sysDictMapper.selectList(new QueryWrapper<Dict>()
+                .select("MAX(dict_id) AS dictId, code, name")
+                .lambda()
+                .groupBy(Dict::getCode, Dict::getName));
+    }
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java

@@ -1,14 +1,11 @@
 package org.nl.system.service.role.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.nl.system.service.role.dao.SysRole;
 
-import javax.persistence.criteria.From;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 /**
  * <p>

nladmin-ui/src/views/system/param/index.vue

@@ -124,7 +124,7 @@ export default {
     }
   },
   created() {
-    this.webSocket()
+    // this.webSocket()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

nladmin-ui/src/views/system/user/center.vue

@@ -20,8 +20,8 @@
             </div>
             <ul class="user-info">
               <li><div style="height: 100%"><svg-icon icon-class="login" /> 登录账号<div class="user-right">{{ user.username }}</div></div></li>
-              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.nickName }}</div></li>
+              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.personName }}</div></li>
-              <li><svg-icon icon-class="dept" /> 所属部门 <div class="user-right"> {{ user.dept.name }}</div></li>
+<!--              <li><svg-icon icon-class="dept" /> 所属部门 <div class="user-right"> {{ user.dept.name }}</div></li>-->
               <li><svg-icon icon-class="phone" /> 手机号码 <div class="user-right">{{ user.phone }}</div></li>
               <li><svg-icon icon-class="email" /> 用户邮箱 <div class="user-right">{{ user.email }}</div></li>
               <li>
@@ -41,8 +41,8 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="用户资料" name="first">
               <el-form ref="form" :model="form" :rules="rules" style="margin-top: 10px;" size="mini" label-width="65px">
-                <el-form-item label="姓名" prop="nickName">
+                <el-form-item label="姓名" prop="personName">
-                  <el-input v-model="form.nickName" style="width: 35%" />
+                  <el-input v-model="form.personName" style="width: 35%" />
                   <span style="color: #C0C0C0;margin-left: 10px;">用户姓名不作为登录使用</span>
                 </el-form-item>
                 <el-form-item label="手机号" prop="phone">
@@ -143,7 +143,7 @@ export default {
       },
       form: {},
       rules: {
-        nickName: [
+        personName: [
           { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
@@ -161,7 +161,7 @@ export default {
     ])
   },
   created() {
-    this.form = { id: this.user.id, nickName: this.user.nickName, gender: this.user.gender, phone: this.user.phone }
+    this.form = { id: this.user.id, personName: this.user.personName, gender: this.user.gender, phone: this.user.phone }
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {