From 41cae1609d4dd406e0903a98d27f497771eb7024 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期二, 23 五月 2023 17:15:26 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg
---
home-server-admin/src/main/java/com/home/xining/service/OfficeSuppliesCollectionService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/home-server-admin/src/main/java/com/home/xining/service/OfficeSuppliesCollectionService.java b/home-server-admin/src/main/java/com/home/xining/service/OfficeSuppliesCollectionService.java
index 5b3a0bf..c4c9850 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/OfficeSuppliesCollectionService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/OfficeSuppliesCollectionService.java
@@ -28,10 +28,10 @@
PermissionService permissionService;
@Autowired
QueryFilterService queryFilterService;
-
+
/**
* 鑾峰彇鍔炲叕瀹ょ敤鍝侀噰璐崟鍒楄〃
- *
+ *
* @param fs
* @return
* @throws BaseException
@@ -49,14 +49,14 @@
if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
filter = filter + " and " + queryFilterService.getQueryFilter(fs);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.BGYPLYB, filter, null, null, null, fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.BGYPLYB, filter, null, null, " bg00 desc", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
/**
* 鑾峰彇鍔炲叕瀹ょ敤鍝侀噰璐崟璇︽儏
- *
+ *
* @param fs
* @return
* @throws BaseException
@@ -64,11 +64,11 @@
public FieldSetEntity getOfficePurchaseInfo(FieldSetEntity fs) throws BaseException {
return baseDao.listInternationDataTable(baseDao.getFieldSetEntity(CmnConst.BGYPLYB, fs.getString(CmnConst.UUID), true), null);
}
-
-
+
+
/**
* 淇濆瓨鍔炲叕瀹ょ敤鍝侀噰璐崟
- *
+ *
* @param fs
* @return
*/
@@ -88,7 +88,7 @@
/**
* 鍒犻櫎鍔炲叕瀹ょ敤鍝侀噰璐崟
- *
+ *
* @param fs
* @return
*/
--
Gitblit v1.9.2