1

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java

@@ -72,6 +72,7 @@ public class DeptServiceImpl implements DeptService {
                 , "endTime", MapUtil.getStr(o, "endTime")
                 , "pid", MapUtil.getStr(o, "pid")
                 , "pidIsNull", MapUtil.getStr(o, "pidIsNull")
+                ,"flag","1"
         );
         JSONArray array = WQL.getWO("SYS_DEPT").addParamMap(map).process().getResultJSONArray(0);
         return array.toJavaList(Dept.class);
@@ -82,7 +83,7 @@ public class DeptServiceImpl implements DeptService {
         if (id==null){
             return null;
         }
-        JSONObject result = WQLObject.getWQLObject("sys_dept").query("dept_id ='" + id + "'").uniqueResult(0);
+        JSONObject result = WQLObject.getWQLObject("SYS_DEPT").query("dept_id ='" + id + "'").uniqueResult(0);
         return result.toJavaObject(tagert);
     }
 

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

@@ -74,8 +74,8 @@
             <el-form-item label="电话" prop="phone">
               <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="姓名" prop="nickName">
+            <el-form-item label="姓名" prop="preson_name">
-              <el-input v-model="form.nickName" style="width: 200px;" />
+              <el-input v-model="form.person_name" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="邮箱" prop="email">
               <el-input v-model="form.email" style="width: 200px;" />
@@ -100,7 +100,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="状态">
-              <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
+              <el-radio-group v-model="form.is_used" :disabled="form.id === user.id">
                 <el-radio
                   v-for="item in dict.user_status"
                   :key="item.id"
@@ -178,7 +178,6 @@
                 style="display:inline;"
                 :data="scope.row"
                 :permission="permission"
-                :disabled-dle="scope.row.id === user.id"
               />
               <el-button
                 slot="left"
@@ -217,12 +216,12 @@ let userRoles = []
 const defaultForm = {
   id: null,
   username: null,
-  nickName: null,
+  person_name: null,
   gender: '男',
   email: null,
   enabled: 'true',
   roles: [],
-  dept: { id: null },
+  dept: { id: 2 },
   phone: null,
   password: null
 }
@@ -255,7 +254,7 @@ export default {
           { required: true, message: '请输入用户名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
-        nickName: [
+        person_name: [
           { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ]
@@ -312,7 +311,8 @@ export default {
       this.roleDatas = []
       userRoles = []
       const _this = this
-      form.roles.forEach(function(role, index) {
+      const arr = form.roles.split(',')
+      arr.forEach(function(role, index) {
         _this.roleDatas.push(role.id)
         const rol = { id: role.id }
         userRoles.push(rol)
@@ -363,7 +363,7 @@ export default {
     },
     getDepts() {
       console.log('获取部门')
-      getDepts({ enabled: true }).then(res => {
+      getDepts({ is_used: 1 }).then(res => {
         console.log('获取的部门信息', res)
         this.depts = res.content.map(function(obj) {
           if (obj.hasChildren) {
@@ -394,7 +394,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+        getDepts({ is_used: 1, pid: parentNode.id }).then(res => {
           parentNode.children = res.content.map(function(obj) {
             if (obj.hasChildren) {
               obj.children = null