mdf:用户，部门去jpa2

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

@@ -36,7 +36,7 @@
               @keyup.enter.native="crud.toQuery"
             />
             <el-select
-              v-model="query.enabled"
+              v-model="query.is_used"
               clearable
               size="mini"
               placeholder="状态"
@@ -110,6 +110,8 @@
                 v-model="roleDatas"
                 style="width: 512px"
                 multiple
+                active-value="1"
+                inactive-value="0"
                 placeholder="请选择"
                 @remove-tag="deleteTag"
                 @change="changeRole"
@@ -242,8 +244,8 @@ export default {
         del: ['admin', 'user:del']
       },
       enabledTypeOptions: [
-        { key: 'true', display_name: '激活' },
-        { key: 'false', display_name: '锁定' }
+        { key: '1', display_name: '激活' },
+        { key: '0', display_name: '锁定' }
       ],
       rules: {
         username: [
@@ -337,20 +339,9 @@ export default {
     },
     // 获取左侧部门数据
     getDeptDatas(node, resolve) {
-      console.log('node', node)
-      console.log('resolve', resolve)
-      const sort = 'id,desc'
-      const params = { sort: sort }
-      if (typeof node !== 'object') {
-        if (node) {
-          params['name'] = node
-        }
-      } else if (node.level !== 0) {
-        params['pid'] = node.data.id
-      }
-      console.log('params', params)
+      debugger
       setTimeout(() => {
-        getDeptTreee().then(res => {
+        getDeptTreee({ name: node }).then(res => {
           console.log('res', res)
           if (resolve) {
             resolve(res.content)