commit：同步2.1版本

2026-01-17 10:36:31 +08:00 · 2021-12-16 21:56:20 +08:00
parent 7af7fe5dc2
commit 387dc5c939
1021 changed files with 3273 additions and 18434 deletions
--- a/orange-demo-multi/orange-demo-multi-web/src/api/Controller/DictionaryController.js
+++ b/orange-demo-multi/orange-demo-multi-web/src/api/Controller/DictionaryController.js
@@ -1,6 +1,17 @@
 import * as staticDict from '@/staticDict'

 export default class DictionaryController {
+  static dictSysRole (sender, params, axiosOption, httpOption) {
+    return new Promise((resolve, reject) => {
+      sender.doUrl('/admin/upms/sysRole/listDict', 'get', params, axiosOption, httpOption).then(res => {
+        let dictData = new staticDict.DictionaryBase('角色字典');
+        dictData.setList(res.data);
+        resolve(dictData);
+      }).catch(err => {
+        reject(err);
+      });
+    });
+  }
  static dictSysUserStatus () {
    return new Promise((resolve) => {
      resolve(staticDict.SysUserStatus);
--- a/orange-demo-multi/orange-demo-multi-web/src/core/http/index.js
+++ b/orange-demo-multi/orange-demo-multi-web/src/core/http/index.js
@@ -2,7 +2,6 @@ import Vue from 'vue';
 import { Loading, Message } from 'element-ui';
 import request from './request';
 import requestUrl from './requestUrl';
-import merge from 'lodash/merge';
 import { globalConfig } from '@/core/config';

 /**
@@ -132,34 +131,41 @@ const ajaxThrottleSet = new Set();
 * @param {Object} options 显示设置
 */
 const doUrl = function (url, type, params, axiosOption, options) {
-  options = merge(globalConfig.httpOption, options);
-  axiosOption = merge(globalConfig.axiosOption, axiosOption);
+  let finalOption = {
+    ...globalConfig.httpOption,
+    ...options
+  };
+  let { showMask, showError, throttleFlag, throttleTimeout } = finalOption;
+  let finalAxiosOption = {
+    ...globalConfig.axiosOption,
+    ...axiosOption
+  }
  if (type == null || type === '') type = 'post';
-  if (ajaxThrottleSet.has(url) && options.throttleFlag) {
+  if (ajaxThrottleSet.has(url) && throttleFlag) {
    return Promise.resolve();
  } else {
-    if (options.throttleFlag) {
+    if (throttleFlag) {
      ajaxThrottleSet.add(url);
      setTimeout(() => {
        ajaxThrottleSet.delete(url);
-      }, options.throttleTimeout || 50);
+      }, throttleTimeout || 50);
    }
    return new Promise((resolve, reject) => {
-      if (options.showMask) loadingManager.showMask();
+      if (showMask) loadingManager.showMask();
      let ajaxCall = null;
      if (type.toLowerCase() === 'get') {
-        ajaxCall = fetchGet(url, params, axiosOption);
+        ajaxCall = fetchGet(url, params, finalAxiosOption);
      } else if (type.toLowerCase() === 'post') {
-        ajaxCall = fetchPost(url, params, axiosOption);
+        ajaxCall = fetchPost(url, params, finalAxiosOption);
      }
  
      if (ajaxCall != null) {
        ajaxCall.then(res => {
-          if (options.showMask) loadingManager.hideMask();
+          if (showMask) loadingManager.hideMask();
          if (res.data && res.data.success) {
            resolve(res.data);
          } else {
-            if (options.showError) {
+            if (showError) {
              Message.error({
                showClose: true,
                message: res.data.errorMessage ? res.data.errorMessage : '数据请求失败'
@@ -168,8 +174,8 @@ const doUrl = function (url, type, params, axiosOption, options) {
            reject(res.data);
          }
        }).catch(e => {
-          if (options.showMask) loadingManager.hideMask();
-          if (options.showError) {
+          if (showMask) loadingManager.hideMask();
+          if (showError) {
            Message.error({
              showClose: true,
              message: e.errorMessage ? e.errorMessage : '网络请求错误'
@@ -178,7 +184,7 @@ const doUrl = function (url, type, params, axiosOption, options) {
          reject(e);
        });
      } else {
-        if (options.showMask) loadingManager.hideMask();
+        if (showMask) loadingManager.hideMask();
        reject(new Error('错误的请求类型 - ' + type));
      }
    });
--- a/orange-demo-multi/orange-demo-multi-web/src/store/actions.js
+++ b/orange-demo-multi/orange-demo-multi-web/src/store/actions.js
@@ -1 +1,16 @@
-export default {}
+// 获得消息列表数据
+function loadMessage (context, owner) {
+  // TODO: 获取消息列表
+}
+
+export default {
+  startMessage: (context, owner) => {
+    // TODO: 开始消息获取轮询
+  },
+  stopMessage: (context) => {
+    // TODO: 结束消息获取轮询
+  },
+  reloadMessage: (context, owner) => {
+    loadMessage(context, owner);
+  }
+}
--- a/orange-demo-multi/orange-demo-multi-web/src/store/getters.js
+++ b/orange-demo-multi/orange-demo-multi-web/src/store/getters.js
@@ -82,5 +82,8 @@ export default {
  },
  getCurrentColumnId: (state) => {
    return state.currentColumnId;
+  },
+  getMessageList: (state) => {
+    return state.messageList;
  }
 }
--- a/orange-demo-multi/orange-demo-multi-web/src/store/mutations.js
+++ b/orange-demo-multi/orange-demo-multi-web/src/store/mutations.js
@@ -157,5 +157,11 @@ export default {
  setCurrentColumnId: (state, columnId) => {
    if (setObjectToSessionStorage('currentColumnId', columnId)) state.currentColumnId = columnId;
    if (setObjectToSessionStorage('currentMenuId', null)) state.currentMenuId = null;
+  },
+  setMessageTimer: (state, timerHandler) => {
+    state.messageTimer = timerHandler;
+  },
+  setMessageList: (state, messageList) => {
+    state.messageList = messageList;
  }
 }
--- a/orange-demo-multi/orange-demo-multi-web/src/store/state.js
+++ b/orange-demo-multi/orange-demo-multi-web/src/store/state.js
@@ -25,5 +25,8 @@ export default {
  // 当前菜单
  currentMenuId: getObjectFromSessionStorage('currentMenuId', undefined),
  // 当前栏目
-  currentColumnId: getObjectFromSessionStorage('currentColumnId', undefined)
+  currentColumnId: getObjectFromSessionStorage('currentColumnId', undefined),
+  // 消息列表
+  messageTimeer: null,
+  messageList: []
 }
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formClass.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formClass.vue
@@ -33,7 +33,7 @@
              </div>
            </div>
            <el-row class="no-scroll" :gutter="20">
-              <el-col class="table-box" :span="24">
+              <el-col class="table-box gutter-bottom" :span="24">
                <el-table ref="studentClass" :data="formClass.StudentClass.impl.dataList" size="mini" @sort-change="formClass.StudentClass.impl.onSortChange"
                  header-cell-class-name="table-header-gray"
                  highlight-current-row @current-change="formClass.StudentClass.impl.currentRowChange">
@@ -89,7 +89,7 @@
                  </div>
                </div>
                <el-row class="no-scroll" :gutter="20">
-                  <el-col class="table-box" :span="24">
+                  <el-col class="table-box gutter-bottom" :span="24">
                    <el-table ref="course" :data="formClass.Course.impl.dataList" size="mini" @sort-change="formClass.Course.impl.onSortChange"
                      header-cell-class-name="table-header-gray">
                      <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Course.impl.getTableIndex" />
@@ -139,7 +139,7 @@
                  </div>
                </div>
                <el-row class="no-scroll" :gutter="20">
-                  <el-col class="table-box" :span="24">
+                  <el-col class="table-box gutter-bottom" :span="24">
                    <el-table ref="student" :data="formClass.Student.impl.dataList" size="mini" @sort-change="formClass.Student.impl.onSortChange"
                      header-cell-class-name="table-header-gray">
                      <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Student.impl.getTableIndex" />
@@ -481,13 +481,6 @@ export default {
     * 移除
     */
    onDeleteClassCourseClick (row) {
-      if (
-        (this.formClass.StudentClass.impl.currentRow || {}).classId == null ||
-        row.courseId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        classId: (this.formClass.StudentClass.impl.currentRow || {}).classId,
        courseId: row.courseId
@@ -519,13 +512,6 @@ export default {
     * 移除
     */
    onDeleteClassStudentClick (row) {
-      if (
-        (this.formClass.StudentClass.impl.currentRow || {}).classId == null ||
-        row.studentId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        classId: (this.formClass.StudentClass.impl.currentRow || {}).classId,
        studentId: row.studentId
@@ -556,12 +542,6 @@ export default {
     * 删除
     */
    onDeleteClick (row) {
-      if (
-        row.classId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        classId: row.classId
      };
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCourse.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCourse.vue
@@ -102,6 +102,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -282,12 +284,6 @@ export default {
     * 删除
     */
    onDeleteClick (row) {
-      if (
-        row.courseId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        courseId: row.courseId
      };
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCourseStats.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCourseStats.vue
@@ -49,7 +49,7 @@
            </div>
          </el-card>
        </el-col>
-        <el-col class="table-box" :span="24">
+        <el-col class="table-box gutter-bottom" :span="24">
          <el-card class="base-card" style="height: 350px" shadow="never" :body-style="{padding: '0px'}">
            <div slot="header" class="base-card-header">
              <span>课程流水统计</span>
@@ -74,6 +74,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateClass.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateClass.vue
@@ -149,9 +149,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -230,16 +230,6 @@ export default {
    onAddClick () {
      this.$refs.formCreateClass.validate((valid) => {
        if (!valid) return;
-        if (
-          this.formData.StudentClass.className == null ||
-          this.formData.StudentClass.schoolId == null ||
-          this.formData.StudentClass.leaderId == null ||
-          this.formData.StudentClass.finishClassHour == null ||
-          this.formData.StudentClass.classLevel == null
-        ) {
-          this.$message.error('请求失败，发现必填参数为空！');
-          return;
-        }
        let params = {
          studentClassDto: {
            className: this.formData.StudentClass.className,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateCourse.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateCourse.vue
@@ -98,6 +98,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -182,9 +184,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -256,18 +258,6 @@ export default {
    onAddClick () {
      this.$refs.formCreateCourse.validate((valid) => {
        if (!valid) return;
-        if (
-          this.formData.Course.courseName == null ||
-          this.formData.Course.price == null ||
-          this.formData.Course.difficulty == null ||
-          this.formData.Course.gradeId == null ||
-          this.formData.Course.subjectId == null ||
-          this.formData.Course.classHour == null ||
-          this.formData.Course.pictureUrl == null
-        ) {
-          this.$message.error('请求失败，发现必填参数为空！');
-          return;
-        }
        let params = {
          courseDto: {
            courseName: this.formData.Course.courseName,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateStudent.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateStudent.vue
@@ -234,9 +234,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -401,21 +401,6 @@ export default {
    onAddClick () {
      this.$refs.formCreateStudent.validate((valid) => {
        if (!valid) return;
-        if (
-          this.formData.Student.loginMobile == null ||
-          this.formData.Student.studentName == null ||
-          this.formData.Student.provinceId == null ||
-          this.formData.Student.cityId == null ||
-          this.formData.Student.districtId == null ||
-          this.formData.Student.gender == null ||
-          this.formData.Student.birthday == null ||
-          this.formData.Student.experienceLevel == null ||
-          this.formData.Student.gradeId == null ||
-          this.formData.Student.schoolId == null
-        ) {
-          this.$message.error('请求失败，发现必填参数为空！');
-          return;
-        }
        let params = {
          studentDto: {
            loginMobile: this.formData.Student.loginMobile,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditClass.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditClass.vue
@@ -152,9 +152,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -238,17 +238,6 @@ export default {
    onUpdateClick () {
      this.$refs.formEditClass.validate((valid) => {
        if (!valid) return;
-        if (
-          this.classId == null ||
-          this.formData.StudentClass.className == null ||
-          this.formData.StudentClass.schoolId == null ||
-          this.formData.StudentClass.leaderId == null ||
-          this.formData.StudentClass.finishClassHour == null ||
-          this.formData.StudentClass.classLevel == null
-        ) {
-          this.$message.error('请求失败，发现必填参数为空！');
-          return;
-        }
        let params = {
          studentClassDto: {
            classId: this.classId,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder.vue
@@ -30,6 +30,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
@@ -90,9 +92,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -110,13 +112,6 @@ export default {
     * 保存
     */
    onUpdateClassCourseClick () {
-      if (
-        this.classId == null ||
-        this.courseId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        classCourseDto: {
          classId: this.classId,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditCourse.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditCourse.vue
@@ -98,6 +98,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -185,9 +187,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -261,19 +263,6 @@ export default {
    onUpdateClick () {
      this.$refs.formEditCourse.validate((valid) => {
        if (!valid) return;
-        if (
-          this.courseId == null ||
-          this.formData.Course.courseName == null ||
-          this.formData.Course.price == null ||
-          this.formData.Course.difficulty == null ||
-          this.formData.Course.gradeId == null ||
-          this.formData.Course.subjectId == null ||
-          this.formData.Course.classHour == null ||
-          this.formData.Course.pictureUrl == null
-        ) {
-          this.$message.error('请求失败，发现必填参数为空！');
-          return;
-        }
        let params = {
          courseDto: {
            courseId: this.courseId,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditStudent.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditStudent.vue
@@ -279,9 +279,9 @@ export default {
    }
  },
  methods: {
-    onCancel (isSuccess) {
+    onCancel (isSuccess, data) {
      if (this.observer != null) {
-        this.observer.cancel(isSuccess);
+        this.observer.cancel(isSuccess, data);
      }
    },
    /**
@@ -469,22 +469,6 @@ export default {
    onUpdateClick () {
      this.$refs.formEditStudent.validate((valid) => {
        if (!valid) return;
-        if (
-          this.studentId == null ||
-          this.formData.Student.loginMobile == null ||
-          this.formData.Student.studentName == null ||
-          this.formData.Student.provinceId == null ||
-          this.formData.Student.cityId == null ||
-          this.formData.Student.districtId == null ||
-          this.formData.Student.gender == null ||
-          this.formData.Student.birthday == null ||
-          this.formData.Student.experienceLevel == null ||
-          this.formData.Student.gradeId == null ||
-          this.formData.Student.schoolId == null
-        ) {
-          this.$message.error('请求失败，发现必填参数为空！');
-          return;
-        }
        let params = {
          studentDto: {
            studentId: this.studentId,
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formSetClassCourse.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formSetClassCourse.vue
@@ -87,6 +87,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -262,12 +264,6 @@ export default {
     * 添加
     */
    onAddClassCourseClick () {
-      if (
-        this.classId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        classId: this.classId,
        classCourseDtoList: this.tableSelectRowList.map((item) => {
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formSetClassStudent.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formSetClassStudent.vue
@@ -66,6 +66,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -187,12 +189,6 @@ export default {
     * 添加
     */
    onAddClassStudentClick () {
-      if (
-        this.classId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        classId: this.classId,
        classStudentDtoList: this.tableSelectRowList.map((item) => {
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudent.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudent.vue
@@ -97,6 +97,8 @@
 <script>
 import { mapGetters } from 'vuex';
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -267,12 +269,6 @@ export default {
     * 删除
     */
    onDeleteClick (row) {
-      if (
-        row.studentId == null
-      ) {
-        this.$message.error('请求失败，发现必填参数为空！');
-        return;
-      }
      let params = {
        studentId: row.studentId
      };
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudentActionDetail.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudentActionDetail.vue
@@ -80,6 +80,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
--- a/orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudentActionStats.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudentActionStats.vue
@@ -88,6 +88,8 @@

 <script>
 /* eslint-disable-next-line */
+import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
+/* eslint-disable-next-line */
 import rules from '@/utils/validate.js';
 /* eslint-disable-next-line */
 import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
--- a/orange-demo-multi/orange-demo-multi-web/src/views/layout/index.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/layout/index.vue
@@ -184,5 +184,5 @@ export default {
 }
 </script>

-<style lang="scss" scoped>
+<style lang="scss">
 </style>
--- a/orange-demo-multi/orange-demo-multi-web/src/views/upms/formSysDept/index.vue
+++ b/orange-demo-multi/orange-demo-multi-web/src/views/upms/formSysDept/index.vue
@@ -78,6 +78,13 @@ export default {
      params.sysDeptDtoFilter = {
        deptName: this.formSysDept.formFilterCopy.deptName
      };
+      // 按照显示顺序排序
+      params.orderParam = [
+        {
+          fieldName: 'showOrder',
+          asc: true
+        }
+      ];
      return new Promise((resolve, reject) => {
        SysDeptController.list(this, params).then(res => {
          resolve({