diff --git a/ant-design-vue-jeecg/src/views/processassessment/assessmentCourse/modules/SeAssessmentcourseModal.vue b/ant-design-vue-jeecg/src/views/processassessment/assessmentCourse/modules/SeAssessmentcourseModal.vue
index 8b8a6efd..5c4099ee 100644
--- a/ant-design-vue-jeecg/src/views/processassessment/assessmentCourse/modules/SeAssessmentcourseModal.vue
+++ b/ant-design-vue-jeecg/src/views/processassessment/assessmentCourse/modules/SeAssessmentcourseModal.vue
@@ -33,7 +33,7 @@
       add () {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.add()
         })
       },
       edit (record) {
diff --git a/ant-design-vue-jeecg/src/views/system/User2ListRef.vue b/ant-design-vue-jeecg/src/views/system/User2ListRef.vue
new file mode 100644
index 00000000..2462d157
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/User2ListRef.vue
@@ -0,0 +1,234 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        bordered
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+  </a-card>
+</template>
+
+<script>
+import UserModal from './modules/UserModal'
+import PasswordModal from './modules/PasswordModal'
+import {putAction, getFileAccessHttpUrl, getAction} from '@/api/manage';
+import {frozenBatch} from '@/api/api'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import SysUserAgentModal from "./modules/SysUserAgentModal";
+import JInput from '@/components/jeecg/JInput'
+import UserRecycleBinModal from './modules/UserRecycleBinModal'
+import JSuperQuery from '@/components/jeecg/JSuperQuery'
+import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
+import UserModalDetail from './modules/UserModalDetail'
+import {filterObj} from "@/utils/util";
+
+export default {
+  name: "User2ListRef",
+  mixins: [JeecgListMixin],
+  components: {
+    JThirdAppButton,
+    SysUserAgentModal,
+    UserModal,
+    PasswordModal,
+    JInput,
+    UserRecycleBinModal,
+    JSuperQuery,
+    UserModalDetail
+  },
+  data() {
+    return {
+      description: '这是用户管理页面',
+      queryParam: {},
+      groupxId:'',
+      recycleBinVisible: false,
+      columns: [
+        /*{
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },*/
+        {
+          title: '用户账号',
+          align: "center",
+          dataIndex: 'username',
+          width: 120,
+          sorter: true
+        },
+        {
+          title: '用户姓名',
+          align: "center",
+          width: 100,
+          dataIndex: 'realname',
+        },
+        // {
+        //   title: '头像',
+        //   align: "center",
+        //   width: 120,
+        //   dataIndex: 'avatar',
+        //   scopedSlots: {customRender: "avatarslot"}
+        // },
+
+        // {
+        //   title: '性别',
+        //   align: "center",
+        //   width: 80,
+        //   dataIndex: 'sex_dictText',
+        //   sorter: true
+        // },
+        // {
+        //   title: '生日',
+        //   align: "center",
+        //   width: 100,
+        //   dataIndex: 'birthday'
+        // },
+        {
+          title: '手机号码',
+          align: "center",
+          width: 100,
+          dataIndex: 'phone'
+        },
+        // {
+        //   title: '部门',
+        //   align: "center",
+        //   width: 180,
+        //   dataIndex: 'orgCodeTxt'
+        // },
+        // {
+        //   title: '负责部门',
+        //   align: "center",
+        //   width: 180,
+        //   dataIndex: 'departIds_dictText'
+        // },
+        {
+          title: '状态',
+          align: "center",
+          width: 80,
+          dataIndex: 'status_dictText'
+        },
+        // {
+        //   title: '操作',
+        //   dataIndex: 'action',
+        //   scopedSlots: {customRender: 'action'},
+        //   align: "center",
+        //   width: 170
+        // }
+
+      ],
+      // superQueryFieldList: [
+      //   {type: 'input', value: 'username', text: '用户账号',},
+      //   {type: 'input', value: 'realname', text: '用户姓名',},
+      //   {type: 'select', value: 'sex', text: '性别', dictCode: 'sex'},
+      // ],
+      url: {
+        syncUser: "/act/process/extActProcess/doSyncUser",
+        listByDepartId: "/sys/user/listByDepartId",
+        delete: "/sys/user/delete",
+        deleteBatch: "/sys/user/deleteBatch",
+        exportXlsUrl: "/sys/user/exportXls",
+        importExcelUrl: "sys/user/importExcel",
+      },
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+  created() {
+    this.loadData();
+  },
+  methods: {
+    // valueChange(value) {
+    //   if (value) this.loadData()
+    // },
+    //加载传递参数
+    loadParameter() {
+      if (this.loadRouteType === false) {
+        this.groupxId = this.$router.
+        this.loadRouteType = true;
+      }
+    },
+    loadData2(groupxId) {
+      alert("loadData groupxId:"+groupxId)
+      if (!this.url.listByDepartId) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      // if (arg === 1) {
+      //   this.ipagination.current = 1;
+      // }
+      this.loadParameter();
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      console.log("----------------the params:", params);
+      getAction(this.url.listByDepartId, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records || res.result;
+          if (res.result.total) {
+            this.ipagination.total = res.result.total;
+          } else {
+            this.ipagination.total = 0;
+          }
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.dataSource.forEach(item => {
+          item['stationName'] = this.stationName;
+          item['stationNum'] = this.stationNum;
+        })
+        this.loading = false
+      })
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      param.groupxId = this.groupxId;
+      return filterObj(param);
+    },
+    onClearSelected() {
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+      this.selectedMainId = ''
+    },
+    onSelectChange(selectedRowKeys) {
+      console.log('selectedRowKeys changed: ', selectedRowKeys);
+      this.selectedRowKeys = selectedRowKeys;
+    },
+  }
+
+}
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/team/GroupxList.vue b/ant-design-vue-jeecg/src/views/team/GroupxList.vue
index 2dc6dd67..3f2afa55 100644
--- a/ant-design-vue-jeecg/src/views/team/GroupxList.vue
+++ b/ant-design-vue-jeecg/src/views/team/GroupxList.vue
@@ -158,7 +158,8 @@ export default {
         {
           title: '负责人',
           align: "center",
-          dataIndex: 'enterprisesManager'
+          // dataIndex: 'enterprisesManager'
+          dataIndex: 'enterprisesManager_dictText'
         },
         {
           title: '手机号',
diff --git a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
index de28d6b4..6a04cc9f 100644
--- a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
+++ b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
@@ -138,10 +138,15 @@ export default {
           align: "center",
           dataIndex: 'groupName'
         },
+        {
+          title: '工号',
+          align: "center",
+          dataIndex: 'workNo_dictText'
+        },
         {
           title: '成员名称',
           align: "center",
-          dataIndex: 'userId'
+          dataIndex: 'userId_dictText'
         },
         {
           title: '加入时间',
diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index 54ed7ff3..5d09a1e9 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -10,7 +10,7 @@
             <!--            <a-form-item label="车间ID">-->
             <!--              <a-input placeholder="请输入车间ID" v-model="queryParam.departId"></a-input>-->
             <!--            </a-form-item>-->
-            <a-form-model-item label="车间">
+            <a-form-model-item label="车间名称">
               <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
               <j-select-depart placeholder="请选择车间" v-model="queryParam.departId"/>
             </a-form-model-item>
@@ -78,6 +78,26 @@
         class="j-table-force-nowrap"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
+
+        <span slot="toolsIds_dictText" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+        <span slot="machineIds_dictText" slot-scope="text, record">
+        <a-popover>
+          <template slot="content">
+            <p>{{ text }}</p>
+          </template>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+        </a-popover>
+        </span>
+
+
+
         <span slot="action1" slot-scope="text, record">
            <a @click="jumpPage1(record)">管理</a>
         </span>
@@ -150,6 +170,18 @@ export default {
           align: "center",
           dataIndex: 'stationName'
         },
+        {
+          title: '设备',
+          align: "center",
+          dataIndex: 'machineIds_dictText',
+          scopedSlots: {customRender: 'machineIds_dictText'}
+        },
+        {
+          title: '工具',
+          align: "center",
+          dataIndex: 'toolsIds_dictText',
+          scopedSlots: {customRender: 'toolsIds_dictText'}
+        },
         {
           title: '备注',
           align: "center",
diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
index 1489a9c3..5eadd80c 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
@@ -5,42 +5,28 @@
     :visible="visible"
     :confirmLoading="confirmLoading"
     switchFullscreen
-    @ok="handleOk"
+    @ok="handleOk2"
     @cancel="handleCancel"
     cancelText="关闭">
 
-    <a-spin :spinning="confirmLoading">
-      <a-form-model ref="form" :model="model" :rules="validatorRules">
-
-        <!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupxId" label="请选择班组">-->
-        <!--          &lt;!&ndash;          <a-input placeholder="请选择班组" v-model="model.groupxId" />&ndash;&gt;-->
-        <!--          <j-search-select-tag placeholder="请选择班组" v-model="model.groupxId" dict="groupx,group_name,id"/>-->
-        <!--        </a-form-model-item>-->
-        <a-form-model-item :label-col="labelCol" :wrapper-col="wrapperCol" prop="userId" label="班组成员">
-          <!--          <j-select-user-by-dep v-model="model.userId" :multi="false"></j-select-user-by-dep>-->
-          <j-select-multi-user placeholder="请选择成员" v-model="model.userId"></j-select-multi-user>
-        </a-form-model-item>
-        <!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="joinTime" label="加入时间">-->
-        <!--          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.joinTime"/>-->
-        <!--        </a-form-model-item>-->
-
-      </a-form-model>
-    </a-spin>
+    <User2ListRef ref="modalForm"></User2ListRef>
   </j-modal>
 </template>
 
 <script>
 import {httpAction} from '@/api/manage'
-import moment from "moment"
+import User2ListRef from '@views/system/User2ListRef'
 
 export default {
   name: "GroupxMemberModal",
+  components: {User2ListRef},
   data() {
     return {
       title: "操作",
       visible: false,
       model: {
         groupxId: '',
+        userId: '',
       },
       labelCol: {
         xs: {span: 24},
@@ -68,12 +54,11 @@ export default {
       ,
     }
   },
-  created() {
-  },
   methods: {
     add(groupxId) {
       this.model.groupxId = groupxId;
       console.log("Modal层接收到上级参数-groupxId:" + this.model.groupxId);
+      this.$refs["modalForm"].loadData2(this.model.groupxId);
       this.edit(this.model);
     },
     // add () {
@@ -90,6 +75,41 @@ export default {
       this.visible = false;
       this.$refs.form.clearValidate();
     },
+    handleOk2() {
+      // this.$refs["modalForm2"].loadData(this.model.groupxId);
+      this.model.userId = this.$refs["modalForm"].selectedRowKeys.toString();
+      // console.log("model.toolids:"+this.model.toolsId);
+      const that = this;
+      // 触发表单验证
+      // this.$refs.form.validate(valid => {
+      //   if (valid) {
+      that.confirmLoading = true;
+      let httpurl = '';
+      let method = '';
+      if (!this.model.id) {
+        httpurl += this.url.addBatch;
+        method = 'post';
+      } else {
+        httpurl += this.url.edit;
+        method = 'put';
+      }
+      console.log("----------the add() model:", JSON.stringify(this.model));
+      httpAction(httpurl, this.model, method).then((res) => {
+        if (res.success) {
+          that.$message.success(res.message);
+          that.$emit('ok');
+        } else {
+          that.$message.warning(res.message);
+        }
+      }).finally(() => {
+        that.confirmLoading = false;
+        that.close();
+      })
+      // } else {
+      //   return false;
+      // }
+      // })
+    },
     handleOk() {
       const that = this;
       // 触发表单验证
diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
index 00d985ea..e1e47dc5 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -117,14 +117,14 @@ export default {
   methods: {
 
     getEnterprisesManagerValChange() {
-      this.enterprisesManager = "sys_user,username,username,id in (select user_id from sys_user_depart where dep_id='" + this.model.departId + "')";
+      this.enterprisesManager = "sys_user,realname,id,id in (select user_id from sys_user_depart where dep_id='" + this.model.departId + "')";
       // this.enterprisesManager = "zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')";
     },
 
     getMobile() {
       let that = this;
       let param = {
-        "username": that.model.enterprisesManager,
+        "id": that.model.enterprisesManager,
         // "departId": that.model.departId,
       }
       // alert(param.toString());
diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
index 9c9926b3..e9c3379e 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
@@ -16,7 +16,7 @@
 <!--                           label="车间ID">-->
 <!--          <a-input placeholder="请输入车间ID" v-model="model.departId"/>-->
 <!--        </a-form-model-item>-->
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="车间">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="车间名称">
           <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
 <!--          <j-select-depart placeholder="请选择车间" v-model="model.departId"/>-->
           <j-dict-select-tag type="list"  v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'" placeholder="请选择车间" />
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index dfcf0868..f6da8b10 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -65,23 +65,23 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/sys/user")
 public class SysUserController {
-	@Autowired
-	private ISysBaseAPI sysBaseAPI;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
-	@Autowired
-	private ISysUserService sysUserService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     @Autowired
     private ISysDepartService sysDepartService;
 
-	@Autowired
-	private ISysUserRoleService sysUserRoleService;
+    @Autowired
+    private ISysUserRoleService sysUserRoleService;
 
-	@Autowired
-	private ISysUserDepartService sysUserDepartService;
+    @Autowired
+    private ISysUserDepartService sysUserDepartService;
 
-	@Autowired
-	private ISysUserRoleService userRoleService;
+    @Autowired
+    private ISysUserRoleService userRoleService;
 
     @Autowired
     private ISysDepartRoleUserService departRoleUserService;
@@ -89,8 +89,8 @@ public class SysUserController {
     @Autowired
     private ISysDepartRoleService departRoleService;
 
-	@Autowired
-	private RedisUtil redisUtil;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Autowired
     private ICollectTypeService collectTypeService;
@@ -104,6 +104,7 @@ public class SysUserController {
 
     /**
      * 获取用户列表数据
+     *
      * @param user
      * @param pageNo
      * @param pageSize
@@ -111,34 +112,73 @@ public class SysUserController {
      * @return
      */
     @PermissionData(pageComponent = "system/UserList")
-	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result<IPage<SysUser>> queryPageList(SysUser user,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
-		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
-		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-    	//TODO 外部模拟登陆临时账号，列表不显示
-        queryWrapper.ne("username","_reserve_user_external");
-		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
-		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
-
-		//批量查询用户的所属部门
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+        QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+        //TODO 外部模拟登陆临时账号，列表不显示
+        queryWrapper.ne("username", "_reserve_user_external");
+        Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+        IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+
+        //批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         //step.2 通过 useids，一次性查询用户的所属部门名字
         List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
-        if(userIds!=null && userIds.size()>0){
-            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
-            pageList.getRecords().forEach(item->{
+        if (userIds != null && userIds.size() > 0) {
+            Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            pageList.getRecords().forEach(item -> {
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
             });
         }
-		result.setSuccess(true);
-		result.setResult(pageList);
-		log.info(pageList.toString());
-		return result;
-	}
+        result.setSuccess(true);
+        result.setResult(pageList);
+        log.info(pageList.toString());
+        return result;
+    }
+
+    /**
+     * 根据部门id查询用户
+     *
+     * @param user
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/listByDepartId", method = RequestMethod.GET)
+    public Result<IPage<SysUser>> listByDepartId(SysUser user,
+                                                 @RequestParam(name = "departId") String departId,
+                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 HttpServletRequest req) {
+        Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+//        QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+//        queryWrapper.ne("username", "_reserve_user_external");
+        Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+//        IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+        IPage<SysUser> pageList = sysUserService.getUserByDepId(page, departId, "");
+
+        //批量查询用户的所属部门
+        //step.1 先拿到全部的 useids
+        //step.2 通过 useids，一次性查询用户的所属部门名字
+//        List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
+//        if (userIds != null && userIds.size() > 0) {
+//            Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+//            pageList.getRecords().forEach(item -> {
+//                item.setOrgCodeTxt(useDepNames.get(item.getId()));
+//            });
+//        }
+        result.setSuccess(true);
+        result.setResult(pageList);
+//        log.info(pageList.toString());
+        return result;
+    }
 
     /**
      * 获取员工列表数据
+     *
      * @param user
      * @param pageNo
      * @param pageSize
@@ -147,13 +187,13 @@ public class SysUserController {
      */
     @PermissionData(pageComponent = "system/StaffList")
     @RequestMapping(value = "/slist", method = RequestMethod.GET)
-    public Result<IPage<SysUser>> queryPageStaffList(SysUser user,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
+    public Result<IPage<SysUser>> queryPageStaffList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
         //TODO 外部模拟登陆临时账号，列表不显示
-        queryWrapper.ne("username","_reserve_user_external");
-        queryWrapper.eq("user_identity",3);
+        queryWrapper.ne("username", "_reserve_user_external");
+        queryWrapper.eq("user_identity", 3);
         Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
         IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
 
@@ -161,9 +201,9 @@ public class SysUserController {
         //step.1 先拿到全部的 useids
         //step.2 通过 useids，一次性查询用户的所属部门名字
         List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
-        if(userIds!=null && userIds.size()>0){
-            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
-            pageList.getRecords().forEach(item->{
+        if (userIds != null && userIds.size() > 0) {
+            Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            pageList.getRecords().forEach(item -> {
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
             });
         }
@@ -175,105 +215,106 @@ public class SysUserController {
 
     //@RequiresRoles({"admin"})
     //@RequiresPermissions("user:add")
-	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
-		Result<SysUser> result = new Result<SysUser>();
-		String selectedRoles = jsonObject.getString("selectedroles");
-		String selectedDeparts = jsonObject.getString("selecteddeparts");
-		try {
-			SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
-			user.setCreateTime(new Date());//设置创建时间
-			String salt = oConvertUtils.randomGen(8);
-			user.setSalt(salt);
-			String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
-			user.setPassword(passwordEncode);
-			user.setStatus(1);
-			user.setDelFlag(CommonConstant.DEL_FLAG_0);
-			// 保存用户走一个service 保证事务
-			sysUserService.saveUser(user, selectedRoles, selectedDeparts);
-			result.success("添加成功！");
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
+        Result<SysUser> result = new Result<SysUser>();
+        String selectedRoles = jsonObject.getString("selectedroles");
+        String selectedDeparts = jsonObject.getString("selecteddeparts");
+        try {
+            SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+            user.setCreateTime(new Date());//设置创建时间
+            String salt = oConvertUtils.randomGen(8);
+            user.setSalt(salt);
+            String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
+            user.setPassword(passwordEncode);
+            user.setStatus(1);
+            user.setDelFlag(CommonConstant.DEL_FLAG_0);
+            // 保存用户走一个service 保证事务
+            sysUserService.saveUser(user, selectedRoles, selectedDeparts);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
 
     //@RequiresRoles({"admin"})
     //@RequiresPermissions("user:edit")
-	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
-	public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
-		Result<SysUser> result = new Result<SysUser>();
-		try {
-			SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
-			baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2);
-			if(sysUser==null) {
-				result.error500("未找到对应实体");
-			}else {
-				SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
-				user.setUpdateTime(new Date());
-				//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
-				user.setPassword(sysUser.getPassword());
-				String roles = jsonObject.getString("selectedroles");
+    @RequestMapping(value = "/edit", method = RequestMethod.PUT)
+    public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
+        Result<SysUser> result = new Result<SysUser>();
+        try {
+            SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
+            baseCommonService.addLog("编辑用户，id： " + jsonObject.getString("id"), CommonConstant.LOG_TYPE_2, 2);
+            if (sysUser == null) {
+                result.error500("未找到对应实体");
+            } else {
+                SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+                user.setUpdateTime(new Date());
+                //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
+                user.setPassword(sysUser.getPassword());
+                String roles = jsonObject.getString("selectedroles");
                 String departs = jsonObject.getString("selecteddeparts");
                 // 修改用户走一个service 保证事务
-				sysUserService.editUser(user, roles, departs);
-				result.success("修改成功!");
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-
-	/**
-	 * 删除用户
-	 */
-	//@RequiresRoles({"admin"})
-	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
-		this.sysUserService.deleteUser(id);
-		return Result.ok("删除用户成功");
-	}
-
-	/**
-	 * 批量删除用户
-	 */
-	//@RequiresRoles({"admin"})
-	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
-		this.sysUserService.deleteBatchUsers(ids);
-		return Result.ok("批量删除用户成功");
-	}
-
-	/**
-	  * 冻结&解冻用户
-	 * @param jsonObject
-	 * @return
-	 */
-	//@RequiresRoles({"admin"})
-	@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
-	public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
-		Result<SysUser> result = new Result<SysUser>();
-		try {
-			String ids = jsonObject.getString("ids");
-			String status = jsonObject.getString("status");
-			String[] arr = ids.split(",");
-			for (String id : arr) {
-				if(oConvertUtils.isNotEmpty(id)) {
-					this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)),
-							new UpdateWrapper<SysUser>().lambda().eq(SysUser::getId,id));
-				}
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			result.error500("操作失败"+e.getMessage());
-		}
-		result.success("操作成功!");
-		return result;
+                sysUserService.editUser(user, roles, departs);
+                result.success("修改成功!");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 删除用户
+     */
+    //@RequiresRoles({"admin"})
+    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        baseCommonService.addLog("删除用户，id： " + id, CommonConstant.LOG_TYPE_2, 3);
+        this.sysUserService.deleteUser(id);
+        return Result.ok("删除用户成功");
+    }
+
+    /**
+     * 批量删除用户
+     */
+    //@RequiresRoles({"admin"})
+    @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        baseCommonService.addLog("批量删除用户， ids： " + ids, CommonConstant.LOG_TYPE_2, 3);
+        this.sysUserService.deleteBatchUsers(ids);
+        return Result.ok("批量删除用户成功");
+    }
+
+    /**
+     * 冻结&解冻用户
+     *
+     * @param jsonObject
+     * @return
+     */
+    //@RequiresRoles({"admin"})
+    @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
+    public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
+        Result<SysUser> result = new Result<SysUser>();
+        try {
+            String ids = jsonObject.getString("ids");
+            String status = jsonObject.getString("status");
+            String[] arr = ids.split(",");
+            for (String id : arr) {
+                if (oConvertUtils.isNotEmpty(id)) {
+                    this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)),
+                            new UpdateWrapper<SysUser>().lambda().eq(SysUser::getId, id));
+                }
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败" + e.getMessage());
+        }
+        result.success("操作成功!");
+        return result;
 
     }
 
@@ -298,11 +339,11 @@ public class SysUserController {
      * @return
      */
     @AutoLog(value = "用户信息-通过username查询")
-    @ApiOperation(value="用户信息-通过username查询", notes="用户信息-通过username查询")
+    @ApiOperation(value = "用户信息-通过username查询", notes = "用户信息-通过username查询")
     @GetMapping(value = "/queryByName")
     public Result<?> queryByName(@RequestParam(name = "username", required = true) String username) {
         SysUser sysUser = sysUserService.getUserByName(username);
-        if(sysUser==null) {
+        if (sysUser == null) {
             return Result.error("未找到对应数据");
         }
         return Result.OK(sysUser);
@@ -327,8 +368,8 @@ public class SysUserController {
 
 
     /**
-	  *  校验用户账号是否唯一<br>
-	  *  可以校验其他 需要检验什么就传什么。。。
+     * 校验用户账号是否唯一<br>
+     * 可以校验其他 需要检验什么就传什么。。。
      *
      * @param sysUser
      * @return
@@ -392,7 +433,7 @@ public class SysUserController {
             }
             return result;
         } catch (Exception e) {
-        	log.error(e.getMessage(), e);
+            log.error(e.getMessage(), e);
             result.setSuccess(false);
             result.setMessage("查找过程中出现了异常: " + e.getMessage());
             return result;
@@ -422,19 +463,19 @@ public class SysUserController {
      * @return
      */
     @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
-    public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) {
+    public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id, @RequestParam(name = "realname", required = false) String realname) {
         Result<List<SysUser>> result = new Result<>();
         //List<SysUser> userList = sysUserDepartService.queryUserByDepId(id);
         SysDepart sysDepart = sysDepartService.getById(id);
-        List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname);
+        List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(), realname);
 
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         //step.2 通过 useids，一次性查询用户的所属部门名字
         List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
-        if(userIds!=null && userIds.size()>0){
-            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
-            userList.forEach(item->{
+        if (userIds != null && userIds.size() > 0) {
+            Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            userList.forEach(item -> {
                 //TODO 临时借用这个字段用于页面展示
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
             });
@@ -445,7 +486,7 @@ public class SysUserController {
             result.setResult(userList);
             return result;
         } catch (Exception e) {
-        	log.error(e.getMessage(), e);
+            log.error(e.getMessage(), e);
             result.setSuccess(false);
             return result;
         }
@@ -453,17 +494,18 @@ public class SysUserController {
 
     /**
      * 用户选择组件 专用  根据用户账号或部门分页查询
+     *
      * @param departId
      * @param username
      * @return
      */
     @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryUserComponentData(
-            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             @RequestParam(name = "departId", required = false) String departId,
-            @RequestParam(name="realname",required=false) String realname,
-            @RequestParam(name="username",required=false) String username) {
+            @RequestParam(name = "realname", required = false) String realname,
+            @RequestParam(name = "username", required = false) String username) {
         IPage<SysUser> pageList = sysUserDepartService.queryDepartUserPageList(departId, username, realname, pageSize, pageNo);
         return Result.OK(pageList);
     }
@@ -475,24 +517,24 @@ public class SysUserController {
      * @param sysUser
      */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
+    public ModelAndView exportXls(SysUser sysUser, HttpServletRequest request) {
         // Step.1 组装查询条件
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         //update-begin--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
         String selections = request.getParameter("selections");
-       if(!oConvertUtils.isEmpty(selections)){
-           queryWrapper.in("id",selections.split(","));
-       }
+        if (!oConvertUtils.isEmpty(selections)) {
+            queryWrapper.in("id", selections.split(","));
+        }
         //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
         List<SysUser> pageList = sysUserService.list(queryWrapper);
 
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表");
         mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
-		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息");
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        ExportParams exportParams = new ExportParams("用户列表数据", "导出人:" + user.getRealname(), "导出信息");
         exportParams.setImageBasePath(upLoadPath);
         mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
@@ -509,7 +551,7 @@ public class SysUserController {
     //@RequiresRoles({"admin"})
     //@RequiresPermissions("user:import")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         // 错误信息
@@ -575,58 +617,58 @@ public class SysUserController {
                 try {
                     file.getInputStream().close();
                 } catch (IOException e) {
-                	log.error(e.getMessage(), e);
+                    log.error(e.getMessage(), e);
                 }
             }
         }
-        return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
+        return ImportExcelUtil.imporReturnRes(errorLines, successLines, errorMessage);
     }
 
     /**
-	 * @功能：根据id 批量查询
-	 * @param userIds
-	 * @return
-	 */
-	@RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
-	public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
-		Result<Collection<SysUser>> result = new Result<>();
-		String[] userId = userIds.split(",");
-		Collection<String> idList = Arrays.asList(userId);
-		Collection<SysUser> userRole = sysUserService.listByIds(idList);
-		result.setSuccess(true);
-		result.setResult(userRole);
-		return result;
-	}
-
-	/**
-	 * 首页用户重置密码
-	 */
+     * @param userIds
+     * @return
+     * @功能：根据id 批量查询
+     */
+    @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
+    public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
+        Result<Collection<SysUser>> result = new Result<>();
+        String[] userId = userIds.split(",");
+        Collection<String> idList = Arrays.asList(userId);
+        Collection<SysUser> userRole = sysUserService.listByIds(idList);
+        result.setSuccess(true);
+        result.setResult(userRole);
+        return result;
+    }
+
+    /**
+     * 首页用户重置密码
+     */
     //@RequiresRoles({"admin"})
     @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
-	public Result<?> updatePassword(@RequestBody JSONObject json) {
-		String username = json.getString("username");
-		String oldpassword = json.getString("oldpassword");
-		String password = json.getString("password");
-		String confirmpassword = json.getString("confirmpassword");
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getUsername().equals(username)){
+    public Result<?> updatePassword(@RequestBody JSONObject json) {
+        String username = json.getString("username");
+        String oldpassword = json.getString("oldpassword");
+        String password = json.getString("password");
+        String confirmpassword = json.getString("confirmpassword");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!sysUser.getUsername().equals(username)) {
             return Result.error("只允许修改自己的密码！");
         }
-		SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
-		if(user==null) {
-			return Result.error("用户不存在！");
-		}
-		return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
-	}
+        SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
+        if (user == null) {
+            return Result.error("用户不存在！");
+        }
+        return sysUserService.resetPassword(username, oldpassword, password, confirmpassword);
+    }
 
     @RequestMapping(value = "/userRoleList", method = RequestMethod.GET)
-    public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                               @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
+    public Result<IPage<SysUser>> userRoleList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
         Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
         String roleId = req.getParameter("roleId");
         String username = req.getParameter("username");
-        IPage<SysUser> pageList = sysUserService.getUserByRoleId(page,roleId,username);
+        IPage<SysUser> pageList = sysUserService.getUserByRoleId(page, roleId, username);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -644,12 +686,12 @@ public class SysUserController {
         Result<String> result = new Result<String>();
         try {
             String sysRoleId = sysUserRoleVO.getRoleId();
-            for(String sysUserId:sysUserRoleVO.getUserIdList()) {
-                SysUserRole sysUserRole = new SysUserRole(sysUserId,sysRoleId);
+            for (String sysUserId : sysUserRoleVO.getUserIdList()) {
+                SysUserRole sysUserRole = new SysUserRole(sysUserId, sysRoleId);
                 QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
-                queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId);
+                queryWrapper.eq("role_id", sysRoleId).eq("user_id", sysUserId);
                 SysUserRole one = sysUserRoleService.getOne(queryWrapper);
-                if(one==null){
+                if (one == null) {
                     sysUserRoleService.save(sysUserRole);
                 }
 
@@ -657,30 +699,32 @@ public class SysUserController {
             result.setMessage("添加成功!");
             result.setSuccess(true);
             return result;
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.setSuccess(false);
             result.setMessage("出错了: " + e.getMessage());
             return result;
         }
     }
+
     /**
-     *   删除指定角色的用户关系
+     * 删除指定角色的用户关系
+     *
      * @param
      * @return
      */
     //@RequiresRoles({"admin"})
     @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
-    public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
-                                                    @RequestParam(name="userId",required=true) String userId
+    public Result<SysUserRole> deleteUserRole(@RequestParam(name = "roleId") String roleId,
+                                              @RequestParam(name = "userId", required = true) String userId
     ) {
         Result<SysUserRole> result = new Result<SysUserRole>();
         try {
             QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
-            queryWrapper.eq("role_id", roleId).eq("user_id",userId);
+            queryWrapper.eq("role_id", roleId).eq("user_id", userId);
             sysUserRoleService.remove(queryWrapper);
             result.success("删除成功!");
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("删除失败！");
         }
@@ -696,15 +740,15 @@ public class SysUserController {
     //@RequiresRoles({"admin"})
     @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
     public Result<SysUserRole> deleteUserRoleBatch(
-            @RequestParam(name="roleId") String roleId,
-            @RequestParam(name="userIds",required=true) String userIds) {
+            @RequestParam(name = "roleId") String roleId,
+            @RequestParam(name = "userIds", required = true) String userIds) {
         Result<SysUserRole> result = new Result<SysUserRole>();
         try {
             QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
-            queryWrapper.eq("role_id", roleId).in("user_id",Arrays.asList(userIds.split(",")));
+            queryWrapper.eq("role_id", roleId).in("user_id", Arrays.asList(userIds.split(",")));
             sysUserRoleService.remove(queryWrapper);
             result.success("删除成功!");
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("删除失败！");
         }
@@ -715,8 +759,8 @@ public class SysUserController {
      * 部门用户列表
      */
     @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
-    public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
+    public Result<IPage<SysUser>> departUserList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
         Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
         String depId = req.getParameter("depId");
@@ -724,22 +768,22 @@ public class SysUserController {
         //根据部门ID查询,当前和下级所有的部门IDS
         List<String> subDepids = new ArrayList<>();
         //部门id为空时，查询我的部门下所有用户
-        if(oConvertUtils.isEmpty(depId)){
+        if (oConvertUtils.isEmpty(depId)) {
             LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1;
-            if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){
+            int userIdentity = user.getUserIdentity() != null ? user.getUserIdentity() : CommonConstant.USER_IDENTITY_1;
+            if (oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2) {
                 subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds());
             }
-        }else{
+        } else {
             subDepids = sysDepartService.getSubDepIdsByDepId(depId);
         }
-        if(subDepids != null && subDepids.size()>0){
-            IPage<SysUser> pageList = sysUserService.getUserByDepIds(page,subDepids,username);
+        if (subDepids != null && subDepids.size() > 0) {
+            IPage<SysUser> pageList = sysUserService.getUserByDepIds(page, subDepids, username);
             //批量查询用户的所属部门
             //step.1 先拿到全部的 useids
             //step.2 通过 useids，一次性查询用户的所属部门名字
             List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
-            if(userIds!=null && userIds.size()>0){
+            if (userIds != null && userIds.size() > 0) {
                 Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
                 pageList.getRecords().forEach(item -> {
                     //批量查询用户的所属部门
@@ -748,7 +792,7 @@ public class SysUserController {
             }
             result.setSuccess(true);
             result.setResult(pageList);
-        }else{
+        } else {
             result.setSuccess(true);
             result.setResult(null);
         }
@@ -779,7 +823,7 @@ public class SysUserController {
     public Result<?> queryByOrgCodeForAddressList(
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            @RequestParam(name = "orgCode",required = false) String orgCode,
+            @RequestParam(name = "orgCode", required = false) String orgCode,
             SysUser userParams
     ) {
         IPage page = new Page(pageNo, pageSize);
@@ -826,19 +870,19 @@ public class SysUserController {
         Result<String> result = new Result<String>();
         try {
             String sysDepId = sysDepartUsersVO.getDepId();
-            for(String sysUserId:sysDepartUsersVO.getUserIdList()) {
-                SysUserDepart sysUserDepart = new SysUserDepart(null,sysUserId,sysDepId);
+            for (String sysUserId : sysDepartUsersVO.getUserIdList()) {
+                SysUserDepart sysUserDepart = new SysUserDepart(null, sysUserId, sysDepId);
                 QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
-                queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId);
+                queryWrapper.eq("dep_id", sysDepId).eq("user_id", sysUserId);
                 SysUserDepart one = sysUserDepartService.getOne(queryWrapper);
-                if(one==null){
+                if (one == null) {
                     sysUserDepartService.save(sysUserDepart);
                 }
             }
             result.setMessage("添加成功!");
             result.setSuccess(true);
             return result;
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.setSuccess(false);
             result.setMessage("出错了: " + e.getMessage());
@@ -847,31 +891,31 @@ public class SysUserController {
     }
 
     /**
-     *   删除指定机构的用户关系
+     * 删除指定机构的用户关系
      */
     //@RequiresRoles({"admin"})
     @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
-    public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
-                                                    @RequestParam(name="userId",required=true) String userId
+    public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name = "depId") String depId,
+                                                    @RequestParam(name = "userId", required = true) String userId
     ) {
         Result<SysUserDepart> result = new Result<SysUserDepart>();
         try {
             QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
-            queryWrapper.eq("dep_id", depId).eq("user_id",userId);
+            queryWrapper.eq("dep_id", depId).eq("user_id", userId);
             boolean b = sysUserDepartService.remove(queryWrapper);
-            if(b){
-                List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
+            if (b) {
+                List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id", depId));
                 List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
-                if(roleIds != null && roleIds.size()>0){
+                if (roleIds != null && roleIds.size() > 0) {
                     QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
-                    query.eq("user_id",userId).in("drole_id",roleIds);
+                    query.eq("user_id", userId).in("drole_id", roleIds);
                     departRoleUserService.remove(query);
                 }
                 result.success("删除成功!");
-            }else{
+            } else {
                 result.error500("当前选中部门与用户无关联关系!");
             }
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("删除失败！");
         }
@@ -884,18 +928,18 @@ public class SysUserController {
     //@RequiresRoles({"admin"})
     @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
     public Result<SysUserDepart> deleteUserInDepartBatch(
-            @RequestParam(name="depId") String depId,
-            @RequestParam(name="userIds",required=true) String userIds) {
+            @RequestParam(name = "depId") String depId,
+            @RequestParam(name = "userIds", required = true) String userIds) {
         Result<SysUserDepart> result = new Result<SysUserDepart>();
         try {
             QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
-            queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(",")));
+            queryWrapper.eq("dep_id", depId).in("user_id", Arrays.asList(userIds.split(",")));
             boolean b = sysUserDepartService.remove(queryWrapper);
-            if(b){
-                departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId);
+            if (b) {
+                departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")), depId);
             }
             result.success("删除成功!");
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("删除失败！");
         }
@@ -903,21 +947,22 @@ public class SysUserController {
     }
 
     /**
-         *  查询当前用户的所有部门/当前部门编码
+     * 查询当前用户的所有部门/当前部门编码
+     *
      * @return
      */
     @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
-    public Result<Map<String,Object>> getCurrentUserDeparts() {
-        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+    public Result<Map<String, Object>> getCurrentUserDeparts() {
+        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
         try {
-        	LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId());
-            Map<String,Object> map = new HashMap<String,Object>();
+            Map<String, Object> map = new HashMap<String, Object>();
             map.put("list", list);
             map.put("orgCode", sysUser.getOrgCode());
             result.setSuccess(true);
             result.setResult(map);
-        }catch(Exception e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("查询失败！");
         }
@@ -925,46 +970,44 @@ public class SysUserController {
     }
 
 
-
-
-	/**
-	 * 用户注册接口
-	 *
-	 * @param jsonObject
-	 * @param user
-	 * @return
-	 */
-	@PostMapping("/register")
-	public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
-		Result<JSONObject> result = new Result<JSONObject>();
-		String phone = jsonObject.getString("phone");
-		String smscode = jsonObject.getString("smscode");
-		Object code = redisUtil.get(phone);
-		String username = jsonObject.getString("username");
-		//未设置用户名，则用手机号作为用户名
-		if(oConvertUtils.isEmpty(username)){
+    /**
+     * 用户注册接口
+     *
+     * @param jsonObject
+     * @param user
+     * @return
+     */
+    @PostMapping("/register")
+    public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
+        Result<JSONObject> result = new Result<JSONObject>();
+        String phone = jsonObject.getString("phone");
+        String smscode = jsonObject.getString("smscode");
+        Object code = redisUtil.get(phone);
+        String username = jsonObject.getString("username");
+        //未设置用户名，则用手机号作为用户名
+        if (oConvertUtils.isEmpty(username)) {
             username = phone;
         }
         //未设置密码，则随机生成一个密码
-		String password = jsonObject.getString("password");
-		if(oConvertUtils.isEmpty(password)){
+        String password = jsonObject.getString("password");
+        if (oConvertUtils.isEmpty(password)) {
             password = RandomUtil.randomString(8);
         }
-		String email = jsonObject.getString("email");
-		SysUser sysUser1 = sysUserService.getUserByName(username);
-		if (sysUser1 != null) {
-			result.setMessage("用户名已注册");
-			result.setSuccess(false);
-			return result;
-		}
-		SysUser sysUser2 = sysUserService.getUserByPhone(phone);
-		if (sysUser2 != null) {
-			result.setMessage("该手机号已注册");
-			result.setSuccess(false);
-			return result;
-		}
-
-		if(oConvertUtils.isNotEmpty(email)){
+        String email = jsonObject.getString("email");
+        SysUser sysUser1 = sysUserService.getUserByName(username);
+        if (sysUser1 != null) {
+            result.setMessage("用户名已注册");
+            result.setSuccess(false);
+            return result;
+        }
+        SysUser sysUser2 = sysUserService.getUserByPhone(phone);
+        if (sysUser2 != null) {
+            result.setMessage("该手机号已注册");
+            result.setSuccess(false);
+            return result;
+        }
+
+        if (oConvertUtils.isNotEmpty(email)) {
             SysUser sysUser3 = sysUserService.getUserByEmail(email);
             if (sysUser3 != null) {
                 result.setMessage("邮箱已被注册");
@@ -972,145 +1015,146 @@ public class SysUserController {
                 return result;
             }
         }
-        if(null == code){
+        if (null == code) {
             result.setMessage("手机验证码失效，请重新获取");
             result.setSuccess(false);
             return result;
         }
-		if (!smscode.equals(code.toString())) {
-			result.setMessage("手机验证码错误");
-			result.setSuccess(false);
-			return result;
-		}
-
-		try {
-			user.setCreateTime(new Date());// 设置创建时间
-			String salt = oConvertUtils.randomGen(8);
-			String passwordEncode = PasswordUtil.encrypt(username, password, salt);
-			user.setSalt(salt);
-			user.setUsername(username);
-			user.setRealname(username);
-			user.setPassword(passwordEncode);
-			user.setEmail(email);
-			user.setPhone(phone);
-			user.setStatus(CommonConstant.USER_UNFREEZE);
-			user.setDelFlag(CommonConstant.DEL_FLAG_0);
-			user.setActivitiSync(CommonConstant.ACT_SYNC_0);
-			/*在创建一个用户之后给他分配一个默认商品收藏夹和我的设计收藏夹*/
+        if (!smscode.equals(code.toString())) {
+            result.setMessage("手机验证码错误");
+            result.setSuccess(false);
+            return result;
+        }
+
+        try {
+            user.setCreateTime(new Date());// 设置创建时间
+            String salt = oConvertUtils.randomGen(8);
+            String passwordEncode = PasswordUtil.encrypt(username, password, salt);
+            user.setSalt(salt);
+            user.setUsername(username);
+            user.setRealname(username);
+            user.setPassword(passwordEncode);
+            user.setEmail(email);
+            user.setPhone(phone);
+            user.setStatus(CommonConstant.USER_UNFREEZE);
+            user.setDelFlag(CommonConstant.DEL_FLAG_0);
+            user.setActivitiSync(CommonConstant.ACT_SYNC_0);
+            /*在创建一个用户之后给他分配一个默认商品收藏夹和我的设计收藏夹*/
             /*================================开始===========================*/
-            CollectType collectType =  new CollectType();
+            CollectType collectType = new CollectType();
             collectType.setCreateBy(user.getUsername());
             collectType.setCollectTypeName("默认收藏夹");
             collectType.setPid("0");
             collectType.setHasChild("1");
             collectTypeService.save(collectType);
-            CollectType collectType1 =  new CollectType();
+            CollectType collectType1 = new CollectType();
             collectType1.setCreateBy(user.getUsername());
             collectType1.setCollectTypeName("我的设计");
             collectType1.setPid("0");
             collectType1.setHasChild("1");
             collectTypeService.save(collectType1);
             /*================================结束===========================*/
-			sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 VideoRecorder
-			result.success("注册成功");
-		} catch (Exception e) {
-			result.error500("注册失败");
-		}
-		return result;
-	}
-
-	/**
-	 * 根据用户名或手机号查询用户信息
-	 * @param
-	 * @return
-	 */
-	@GetMapping("/querySysUser")
-	public Result<Map<String, Object>> querySysUser(SysUser sysUser) {
-		String phone = sysUser.getPhone();
-		String username = sysUser.getUsername();
-		Result<Map<String, Object>> result = new Result<Map<String, Object>>();
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (oConvertUtils.isNotEmpty(phone)) {
-			SysUser user = sysUserService.getUserByPhone(phone);
-			if(user!=null) {
-				map.put("username",user.getUsername());
-				map.put("phone",user.getPhone());
-				result.setSuccess(true);
-				result.setResult(map);
-				return result;
-			}
-		}
-		if (oConvertUtils.isNotEmpty(username)) {
-			SysUser user = sysUserService.getUserByName(username);
-			if(user!=null) {
-				map.put("username",user.getUsername());
-				map.put("phone",user.getPhone());
-				result.setSuccess(true);
-				result.setResult(map);
-				return result;
-			}
-		}
-		result.setSuccess(false);
-		result.setMessage("验证失败");
-		return result;
-	}
-
-	/**
-	 * 用户手机号验证
-	 */
-	@PostMapping("/phoneVerification")
-	public Result<Map<String,String>> phoneVerification(@RequestBody JSONObject jsonObject) {
-		Result<Map<String,String>> result = new Result<Map<String,String>>();
-		String phone = jsonObject.getString("phone");
-		String smscode = jsonObject.getString("smscode");
-		Object code = redisUtil.get(phone);
-		if (!smscode.equals(code)) {
-			result.setMessage("手机验证码错误");
-			result.setSuccess(false);
-			return result;
-		}
-		//设置有效时间
-		redisUtil.set(phone, smscode,600);
-		//新增查询用户名
-		LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
-        query.eq(SysUser::getPhone,phone);
+            sysUserService.addUserWithRole(user, "ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 VideoRecorder
+            result.success("注册成功");
+        } catch (Exception e) {
+            result.error500("注册失败");
+        }
+        return result;
+    }
+
+    /**
+     * 根据用户名或手机号查询用户信息
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/querySysUser")
+    public Result<Map<String, Object>> querySysUser(SysUser sysUser) {
+        String phone = sysUser.getPhone();
+        String username = sysUser.getUsername();
+        Result<Map<String, Object>> result = new Result<Map<String, Object>>();
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (oConvertUtils.isNotEmpty(phone)) {
+            SysUser user = sysUserService.getUserByPhone(phone);
+            if (user != null) {
+                map.put("username", user.getUsername());
+                map.put("phone", user.getPhone());
+                result.setSuccess(true);
+                result.setResult(map);
+                return result;
+            }
+        }
+        if (oConvertUtils.isNotEmpty(username)) {
+            SysUser user = sysUserService.getUserByName(username);
+            if (user != null) {
+                map.put("username", user.getUsername());
+                map.put("phone", user.getPhone());
+                result.setSuccess(true);
+                result.setResult(map);
+                return result;
+            }
+        }
+        result.setSuccess(false);
+        result.setMessage("验证失败");
+        return result;
+    }
+
+    /**
+     * 用户手机号验证
+     */
+    @PostMapping("/phoneVerification")
+    public Result<Map<String, String>> phoneVerification(@RequestBody JSONObject jsonObject) {
+        Result<Map<String, String>> result = new Result<Map<String, String>>();
+        String phone = jsonObject.getString("phone");
+        String smscode = jsonObject.getString("smscode");
+        Object code = redisUtil.get(phone);
+        if (!smscode.equals(code)) {
+            result.setMessage("手机验证码错误");
+            result.setSuccess(false);
+            return result;
+        }
+        //设置有效时间
+        redisUtil.set(phone, smscode, 600);
+        //新增查询用户名
+        LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
+        query.eq(SysUser::getPhone, phone);
         SysUser user = sysUserService.getOne(query);
-        Map<String,String> map = new HashMap<>();
-        map.put("smscode",smscode);
-        map.put("username",user.getUsername());
+        Map<String, String> map = new HashMap<>();
+        map.put("smscode", smscode);
+        map.put("username", user.getUsername());
         result.setResult(map);
-		result.setSuccess(true);
-		return result;
-	}
-
-	/**
-	 * 用户更改密码
-	 */
-	@GetMapping("/passwordChange")
-	public Result<SysUser> passwordChange(@RequestParam(name="username")String username,
-										  @RequestParam(name="password")String password,
-			                              @RequestParam(name="smscode")String smscode,
-			                              @RequestParam(name="phone") String phone) {
+        result.setSuccess(true);
+        return result;
+    }
+
+    /**
+     * 用户更改密码
+     */
+    @GetMapping("/passwordChange")
+    public Result<SysUser> passwordChange(@RequestParam(name = "username") String username,
+                                          @RequestParam(name = "password") String password,
+                                          @RequestParam(name = "smscode") String smscode,
+                                          @RequestParam(name = "phone") String phone) {
         Result<SysUser> result = new Result<SysUser>();
-        if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode)  || oConvertUtils.isEmpty(phone) ) {
+        if (oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) {
             result.setMessage("重置密码失败！");
             result.setSuccess(false);
             return result;
         }
 
-        SysUser sysUser=new SysUser();
-        Object object= redisUtil.get(phone);
-        if(null==object) {
-        	result.setMessage("短信验证码失效！");
+        SysUser sysUser = new SysUser();
+        Object object = redisUtil.get(phone);
+        if (null == object) {
+            result.setMessage("短信验证码失效！");
             result.setSuccess(false);
             return result;
         }
-        if(!smscode.equals(object)) {
-        	result.setMessage("短信验证码不匹配！");
+        if (!smscode.equals(object)) {
+            result.setMessage("短信验证码不匹配！");
             result.setSuccess(false);
             return result;
         }
-        sysUser = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername,username).eq(SysUser::getPhone,phone));
+        sysUser = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username).eq(SysUser::getPhone, phone));
         if (sysUser == null) {
             result.setMessage("未找到用户！");
             result.setSuccess(false);
@@ -1128,79 +1172,80 @@ public class SysUserController {
     }
 
 
-	/**
-	 * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
-	 *
-	 * @return
-	 */
-	@GetMapping("/getUserSectionInfoByToken")
-	public Result<?> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
-		try {
-			String username = null;
-			// 如果没有传递token，就从header中获取token并获取用户信息
-			if (oConvertUtils.isEmpty(token)) {
-				 username = JwtUtil.getUserNameByToken(request);
-			} else {
-				 username = JwtUtil.getUsername(token);
-			}
-
-			log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
-
-			// 根据用户名查询用户信息
-			SysUser sysUser = sysUserService.getUserByName(username);
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("sysUserId", sysUser.getId());
-			map.put("sysUserCode", sysUser.getUsername()); // 当前登录用户登录账号
-			map.put("sysUserName", sysUser.getRealname()); // 当前登录用户真实名称
-			map.put("sysOrgCode", sysUser.getOrgCode()); // 当前登录用户部门编号
-
-			log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map);
-
-			return Result.ok(map);
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			return Result.error(500, "查询失败:" + e.getMessage());
-		}
-	}
-
-	/**
-	 * 【APP端接口】获取用户列表  根据用户名和真实名 模糊匹配
-	 * @param keyword
-	 * @param pageNo
-	 * @param pageSize
-	 * @return
-	 */
-	@GetMapping("/appUserList")
-	public Result<?> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
-            @RequestParam(name = "username", required = false) String username,
-			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-			@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-            @RequestParam(name = "syncFlow", required = false) String syncFlow) {
-		try {
-			//TODO 从查询效率上将不要用mp的封装的page分页查询 建议自己写分页语句
-			LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
-			if(oConvertUtils.isNotEmpty(syncFlow)){
+    /**
+     * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
+     *
+     * @return
+     */
+    @GetMapping("/getUserSectionInfoByToken")
+    public Result<?> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
+        try {
+            String username = null;
+            // 如果没有传递token，就从header中获取token并获取用户信息
+            if (oConvertUtils.isEmpty(token)) {
+                username = JwtUtil.getUserNameByToken(request);
+            } else {
+                username = JwtUtil.getUsername(token);
+            }
+
+            log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
+
+            // 根据用户名查询用户信息
+            SysUser sysUser = sysUserService.getUserByName(username);
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("sysUserId", sysUser.getId());
+            map.put("sysUserCode", sysUser.getUsername()); // 当前登录用户登录账号
+            map.put("sysUserName", sysUser.getRealname()); // 当前登录用户真实名称
+            map.put("sysOrgCode", sysUser.getOrgCode()); // 当前登录用户部门编号
+
+            log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map);
+
+            return Result.ok(map);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return Result.error(500, "查询失败:" + e.getMessage());
+        }
+    }
+
+    /**
+     * 【APP端接口】获取用户列表  根据用户名和真实名 模糊匹配
+     *
+     * @param keyword
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/appUserList")
+    public Result<?> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
+                                 @RequestParam(name = "username", required = false) String username,
+                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                 @RequestParam(name = "syncFlow", required = false) String syncFlow) {
+        try {
+            //TODO 从查询效率上将不要用mp的封装的page分页查询 建议自己写分页语句
+            LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
+            if (oConvertUtils.isNotEmpty(syncFlow)) {
                 query.eq(SysUser::getActivitiSync, CommonConstant.ACT_SYNC_1);
             }
-			query.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0);
-			if(oConvertUtils.isNotEmpty(username)){
-			    if(username.contains(",")){
-                    query.in(SysUser::getUsername,username.split(","));
-                }else{
-                    query.eq(SysUser::getUsername,username);
+            query.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0);
+            if (oConvertUtils.isNotEmpty(username)) {
+                if (username.contains(",")) {
+                    query.in(SysUser::getUsername, username.split(","));
+                } else {
+                    query.eq(SysUser::getUsername, username);
                 }
-            }else{
+            } else {
                 query.and(i -> i.like(SysUser::getUsername, keyword).or().like(SysUser::getRealname, keyword));
             }
-			Page<SysUser> page = new Page<>(pageNo, pageSize);
-			IPage<SysUser> res = this.sysUserService.page(page, query);
-			return Result.ok(res);
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			return Result.error(500, "查询失败:" + e.getMessage());
-		}
+            Page<SysUser> page = new Page<>(pageNo, pageSize);
+            IPage<SysUser> res = this.sysUserService.page(page, query);
+            return Result.ok(res);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return Result.error(500, "查询失败:" + e.getMessage());
+        }
 
-	}
+    }
 
     /**
      * 获取被逻辑删除的用户列表，无分页
@@ -1257,49 +1302,50 @@ public class SysUserController {
 
     /**
      * 移动端修改用户信息
+     *
      * @param jsonObject
      * @return
      */
     @RequestMapping(value = "/appEdit", method = RequestMethod.PUT)
-    public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
+    public Result<SysUser> appEdit(HttpServletRequest request, @RequestBody JSONObject jsonObject) {
         Result<SysUser> result = new Result<SysUser>();
         try {
             String username = JwtUtil.getUserNameByToken(request);
             SysUser sysUser = sysUserService.getUserByName(username);
-            baseCommonService.addLog("移动端编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2);
-            String realname=jsonObject.getString("realname");
-            String avatar=jsonObject.getString("avatar");
-            String sex=jsonObject.getString("sex");
-            String phone=jsonObject.getString("phone");
-            String email=jsonObject.getString("email");
-            Date birthday=jsonObject.getDate("birthday");
+            baseCommonService.addLog("移动端编辑用户，id： " + jsonObject.getString("id"), CommonConstant.LOG_TYPE_2, 2);
+            String realname = jsonObject.getString("realname");
+            String avatar = jsonObject.getString("avatar");
+            String sex = jsonObject.getString("sex");
+            String phone = jsonObject.getString("phone");
+            String email = jsonObject.getString("email");
+            Date birthday = jsonObject.getDate("birthday");
             SysUser userPhone = sysUserService.getUserByPhone(phone);
-            if(sysUser==null) {
+            if (sysUser == null) {
                 result.error500("未找到对应用户!");
-            }else {
-                if(userPhone!=null){
+            } else {
+                if (userPhone != null) {
                     String userPhonename = userPhone.getUsername();
-                    if(!userPhonename.equals(username)){
+                    if (!userPhonename.equals(username)) {
                         result.error500("手机号已存在!");
                         return result;
                     }
                 }
-                if(StringUtils.isNotBlank(realname)){
+                if (StringUtils.isNotBlank(realname)) {
                     sysUser.setRealname(realname);
                 }
-                if(StringUtils.isNotBlank(avatar)){
+                if (StringUtils.isNotBlank(avatar)) {
                     sysUser.setAvatar(avatar);
                 }
-                if(StringUtils.isNotBlank(sex)){
+                if (StringUtils.isNotBlank(sex)) {
                     sysUser.setSex(Integer.parseInt(sex));
                 }
-                if(StringUtils.isNotBlank(phone)){
+                if (StringUtils.isNotBlank(phone)) {
                     sysUser.setPhone(phone);
                 }
-                if(StringUtils.isNotBlank(email)){
+                if (StringUtils.isNotBlank(email)) {
                     sysUser.setEmail(email);
                 }
-                if(null != birthday){
+                if (null != birthday) {
                     sysUser.setBirthday(birthday);
                 }
                 sysUser.setUpdateTime(new Date());
@@ -1311,20 +1357,22 @@ public class SysUserController {
         }
         return result;
     }
+
     /**
      * 移动端保存设备信息
+     *
      * @param clientId
      * @return
      */
     @RequestMapping(value = "/saveClientId", method = RequestMethod.GET)
-    public Result<SysUser> saveClientId(HttpServletRequest request,@RequestParam("clientId")String clientId) {
+    public Result<SysUser> saveClientId(HttpServletRequest request, @RequestParam("clientId") String clientId) {
         Result<SysUser> result = new Result<SysUser>();
         try {
             String username = JwtUtil.getUserNameByToken(request);
             SysUser sysUser = sysUserService.getUserByName(username);
-            if(sysUser==null) {
+            if (sysUser == null) {
                 result.error500("未找到对应用户!");
-            }else {
+            } else {
                 sysUser.setClientId(clientId);
                 sysUserService.updateById(sysUser);
             }
@@ -1334,6 +1382,7 @@ public class SysUserController {
         }
         return result;
     }
+
     /**
      * 根据userid获取用户信息和部门员工信息
      *
@@ -1342,48 +1391,52 @@ public class SysUserController {
     @GetMapping("/queryChildrenByUsername")
     public Result queryChildrenByUsername(@RequestParam("userId") String userId) {
         //获取用户信息
-        Map<String,Object> map=new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         SysUser sysUser = sysUserService.getById(userId);
         String username = sysUser.getUsername();
         Integer identity = sysUser.getUserIdentity();
-        map.put("sysUser",sysUser);
-        if(identity!=null && identity==2){
+        map.put("sysUser", sysUser);
+        if (identity != null && identity == 2) {
             //获取部门用户信息
             String departIds = sysUser.getDepartIds();
-            if(StringUtils.isNotBlank(departIds)){
+            if (StringUtils.isNotBlank(departIds)) {
                 List<String> departIdList = Arrays.asList(departIds.split(","));
-                List<SysUser> childrenUser = sysUserService.queryByDepIds(departIdList,username);
-                map.put("children",childrenUser);
+                List<SysUser> childrenUser = sysUserService.queryByDepIds(departIdList, username);
+                map.put("children", childrenUser);
             }
         }
         return Result.ok(map);
     }
+
     /**
      * 移动端查询部门用户信息
+     *
      * @param departId
      * @return
      */
     @GetMapping("/appQueryByDepartId")
-    public Result<List<SysUser>> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) {
+    public Result<List<SysUser>> appQueryByDepartId(@RequestParam(name = "departId", required = false) String departId) {
         Result<List<SysUser>> result = new Result<List<SysUser>>();
-        List<String> list=new ArrayList<String> ();
+        List<String> list = new ArrayList<String>();
         list.add(departId);
-        List<SysUser> childrenUser = sysUserService.queryByDepIds(list,null);
+        List<SysUser> childrenUser = sysUserService.queryByDepIds(list, null);
         result.setResult(childrenUser);
         return result;
     }
+
     /**
      * 移动端查询用户信息(通过用户名模糊查询)
+     *
      * @param keyword
      * @return
      */
     @GetMapping("/appQueryUser")
     public Result<List<SysUser>> appQueryUser(@RequestParam(name = "keyword", required = false) String keyword) {
         Result<List<SysUser>> result = new Result<List<SysUser>>();
-        LambdaQueryWrapper<SysUser> queryWrapper =new LambdaQueryWrapper<SysUser>();
+        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<SysUser>();
         //TODO 外部模拟登陆临时账号，列表不显示
-        queryWrapper.ne(SysUser::getUsername,"_reserve_user_external");
-        if(StringUtils.isNotBlank(keyword)){
+        queryWrapper.ne(SysUser::getUsername, "_reserve_user_external");
+        if (StringUtils.isNotBlank(keyword)) {
             queryWrapper.and(i -> i.like(SysUser::getUsername, keyword).or().like(SysUser::getRealname, keyword));
         }
         List<SysUser> list = sysUserService.list(queryWrapper);
@@ -1391,9 +1444,9 @@ public class SysUserController {
         //step.1 先拿到全部的 useids
         //step.2 通过 useids，一次性查询用户的所属部门名字
         List<String> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
-        if(userIds!=null && userIds.size()>0){
-            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
-            list.forEach(item->{
+        if (userIds != null && userIds.size() > 0) {
+            Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            list.forEach(item -> {
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
             });
         }
@@ -1403,34 +1456,35 @@ public class SysUserController {
 
     /**
      * 根据用户名修改手机号
+     *
      * @param json
      * @return
      */
     @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT)
-    public Result<?> changMobile(@RequestBody JSONObject json,HttpServletRequest request) {
+    public Result<?> changMobile(@RequestBody JSONObject json, HttpServletRequest request) {
         String smscode = json.getString("smscode");
         String phone = json.getString("phone");
         Result<SysUser> result = new Result<SysUser>();
         //获取登录用户名
         String username = JwtUtil.getUserNameByToken(request);
-        if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) {
+        if (oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) {
             result.setMessage("修改手机号失败！");
             result.setSuccess(false);
             return result;
         }
-        Object object= redisUtil.get(phone);
-        if(null==object) {
+        Object object = redisUtil.get(phone);
+        if (null == object) {
             result.setMessage("短信验证码失效！");
             result.setSuccess(false);
             return result;
         }
-        if(!smscode.equals(object)) {
+        if (!smscode.equals(object)) {
             result.setMessage("短信验证码不匹配！");
             result.setSuccess(false);
             return result;
         }
         SysUser user = sysUserService.getUserByName(username);
-        if(user==null) {
+        if (user == null) {
             return Result.error("用户不存在！");
         }
         user.setPhone(phone);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
index 0a04b247..937e20a4 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
@@ -16,7 +16,11 @@ import org.jeecg.modules.activiti.entity.ActBusiness;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.team.entity.Station;
+import org.jeecg.modules.team.entity.StationMachine;
+import org.jeecg.modules.team.entity.StationTool;
+import org.jeecg.modules.team.service.IStationMachineService;
 import org.jeecg.modules.team.service.IStationService;
+import org.jeecg.modules.team.service.IStationToolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -45,6 +49,12 @@ public class StationController extends JeecgController<Station, IStationService>
     @Autowired
     private ISysDepartService iSysDepartService;
 
+    @Autowired
+    private IStationToolService iStationToolService;
+
+    @Autowired
+    private IStationMachineService iStationMachineService;
+
     /**
      * 分页列表查询
      *
@@ -70,7 +80,11 @@ public class StationController extends JeecgController<Station, IStationService>
             Collections.sort(records, Comparator.comparingInt(Station::getStationNum));
             List<String> ids = records.stream().map(o -> o.getDepartId()).collect(Collectors.toList());
             List<SysDepart> departList = iSysDepartService.list(new LambdaQueryWrapper<SysDepart>().in(SysDepart::getId, ids));
-            records.forEach(e -> {
+            records.stream().forEach(e -> {
+                List<StationTool> stationTools = iStationToolService.list(new LambdaQueryWrapper<StationTool>().eq(StationTool::getStationId, e.getId()));
+                e.setToolsIds(stationTools.stream().map(StationTool::getToolsId).collect(Collectors.joining(",")));
+                List<StationMachine> machineList = iStationMachineService.list(new LambdaQueryWrapper<StationMachine>().eq(StationMachine::getStationId, e.getId()));
+                e.setMachineIds(machineList.stream().map(StationMachine::getMachineId).collect(Collectors.joining(",")));
                 departList.forEach(j -> {
                     if (e.getDepartId().equals(j.getId())) {
                         e.setDepartName(j.getDepartName());
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
index 4fcffeae..831fa6a8 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java
@@ -18,41 +18,54 @@ import java.util.Date;
 /**
  * @Description: 班组
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date: 2022-12-03
  * @Version: V1.0
  */
 @Data
 @TableName("groupx")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="groupx对象", description="班组")
+@ApiModel(value = "groupx对象", description = "班组")
 public class Groupx {
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-	private String id;
-	/**部门id*/
-	@Excel(name = "部门id", width = 15)
+    private String id;
+    /**
+     * 部门id
+     */
+    @Excel(name = "部门id", width = 15)
     @ApiModelProperty(value = "部门id")
-	@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
-	private String departId;
-	/**班组名称*/
-	@Excel(name = "班组名称", width = 15)
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    private String departId;
+    /**
+     * 班组名称
+     */
+    @Excel(name = "班组名称", width = 15)
     @ApiModelProperty(value = "班组名称")
-	private String groupName;
-	/**负责人;fk用户表id*/
-	@Excel(name = "负责人;fk用户表id", width = 15)
+    private String groupName;
+    /**
+     * 负责人;fk用户表id
+     */
+    @Excel(name = "负责人;fk用户表id", width = 15)
     @ApiModelProperty(value = "负责人;fk用户表id")
-	private String enterprisesManager;
-	/**手机号*/
-	@Excel(name = "手机号", width = 15)
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    private String enterprisesManager;
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号", width = 15)
     @ApiModelProperty(value = "手机号")
-	private String mobile;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String mobile;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
-	private Date createTime;
+    private Date createTime;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java
index be1fe870..13d8af6e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java
@@ -1,6 +1,7 @@
 package org.jeecg.modules.team.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -17,37 +19,50 @@ import java.util.Date;
 /**
  * @Description: 班组成员表管理
  * @Author: jeecg-boot
- * @Date:   2022-12-03
+ * @Date: 2022-12-03
  * @Version: V1.0
  */
 @Data
 @TableName("groupx_member")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="groupx_member对象", description="班组成员管理")
+@ApiModel(value = "groupx_member对象", description = "班组成员管理")
 public class GroupxMember {
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-	private String id;
-	/**班组id FK 班组表*/
-	@Excel(name = "班组id FK 班组表", width = 15)
+    private String id;
+    /**
+     * 班组id FK 班组表
+     */
+    @Excel(name = "班组id FK 班组表", width = 15)
     @ApiModelProperty(value = "班组id FK 班组表")
-	private String groupxId;
-	/**用户id FK 用户表*/
-	@Excel(name = "用户id FK 用户表", width = 15)
+    private String groupxId;
+    /**
+     * 用户id FK 用户表
+     */
+    @Excel(name = "用户id FK 用户表", width = 15)
     @ApiModelProperty(value = "用户id FK 用户表")
-	private String userId;
-	/**加入时间*/
-	@Excel(name = "加入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    private String userId;
+
+    @TableField(exist = false)
+    @Dict(dictTable = "sys_user", dicText = "work_no", dicCode = "id")
+    private String workNo;
+    /**
+     * 加入时间
+     */
+    @Excel(name = "加入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "加入时间")
-	private Date joinTime;
+    private Date joinTime;
 
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
index b4479b98..4866f9e5 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
@@ -84,4 +84,16 @@ public class Station {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String description;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备id列表")
+    @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+    private String machineIds;
+    /**
+     * 工具id列表
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "工具id列表")
+    @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
+    private String toolsIds;
 }