diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java index 73946868..10418330 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java @@ -37,6 +37,13 @@ public class DicEORestController extends BaseController { public ResponseMessage> page(DictionaryEOPage page) throws Exception { page.setDictionaryCodeOperator("like"); page.setDictionaryNameOperator("like"); + if(org.apache.commons.lang3.StringUtils.isNotBlank(page.getPaixu()) && org.apache.commons.lang3.StringUtils.isNotBlank(page.getShunxu())){ + String sql = page.getPaixu()+" "+page.getShunxu(); + page.setSql(sql); + }else{ + String sql = "order_num,u0.id"; + page.setSql(sql); + } List rows = dicEOService.queryAllDicByPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml index 898dc60e..a293f7cc 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml @@ -267,12 +267,13 @@