diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppCategoryController.java b/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppCategoryController.java index 14879e0ed8245a5eebb04cf1e53c52e9fbc680dd..f86f614238ff0fbd04fff786e303acfd6bc61d7e 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppCategoryController.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppCategoryController.java @@ -1,4 +1,6 @@ package com.mortals.xhx.module.app.web; +import com.mortals.framework.exception.AppException; +import com.mortals.framework.model.OrderCol; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.xhx.base.system.param.service.ParamService; import org.springframework.beans.factory.annotation.Autowired; @@ -46,4 +48,17 @@ public class AppCategoryController extends BaseCRUDJsonBodyMappingController<App } + /** + * @param query + * @param model + * @param context + * @throws AppException + */ + @Override + protected void doListBefore(AppCategoryEntity query, Map<String, Object> model, Context context) throws AppException { + super.doListBefore(query, model, context); + + query.setOrderColList(Arrays.asList(new OrderCol("sort"))); + + } } \ No newline at end of file diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue index 873abd189d4e0c458cbbcdf26f1d6814225bf748..338bc9a20927bf5c9fd663bc006b2275276e77ef 100644 --- a/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue +++ b/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue @@ -233,10 +233,10 @@ export default { "pjxt", "pj_name", ], - datingList:[], - bumenList:[], - hallid:'', - sectionid:'' + datingList: [], + bumenList: [], + hallid: '', + sectionid: '' }; }, components: { @@ -343,8 +343,8 @@ export default { pjxt, time: this.BegindAndEndTime, info: this.searchName, - hallid:this.hallid, - sectionid:this.sectionid, + hallid: this.hallid, + sectionid: this.sectionid, ...search, }); if (res.code == 1) { @@ -363,7 +363,7 @@ export default { openHandlingDetails(record) { console.log(record) // 鍒ゆ柇涓虹獥鍙e睆鎴栬€呭叾浠栫姸鍐碉紝璋冪敤涓嶅悓鎺ュ彛 - if (record.pjxt == 1) { + if (record.pjxt == 1 && record.queueid) { this.$refs.HandlingDetails.modalInfo.title = "鍔炵悊鏄庣粏"; this.$refs.HandlingDetails.modalInfo.show = 1; this.togetQueEvaData(record);