Merge branch 'dev_web' into dev_web_online

fe/PC/src/views/systemManage/userManage.vue

@@ -463,7 +463,7 @@ export default {
       this.options = res.items;
     });
     //获取所有部门
-    departmentList({},'auth/department').then(res => {
+    departmentList({MaxResultCount: 1000},'auth/department').then(res => {
       this.departmentOptions = res.items;
     })
   },
@@ -596,7 +596,7 @@ export default {
         this.concurrencyStamp = row.concurrencyStamp;
         this.form.extraProperties.IsActive = row.extraProperties.IsActive;
         this.form.extraProperties.DepartmentCode = row.extraProperties.DepartmentCode;
-        departmentList({},'auth/department').then(res => {
+        departmentList({MaxResultCount: 1000},'auth/department').then(res => {
           this.departmentOptions = res.items
         })
         usersroles().then((res) => {