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/LawEnforcementService.java | 2 +-
home-server-admin/src/main/java/com/home/xining/service/OfficePurchaseService.java | 2 +-
home-server-admin/src/main/java/com/home/xining/controller/SendDocumentController.java | 2 +-
home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java | 2 +-
home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java | 2 +-
home-server-admin/src/main/java/com/home/xining/service/OfficeSuppliesCollectionService.java | 16 ++++++++--------
product-server-admin/src/main/java/com/product/admin/entity/MenuTreeEntity.java | 3 ++-
home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java | 2 +-
home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java | 2 +-
9 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/home-server-admin/src/main/java/com/home/xining/controller/SendDocumentController.java b/home-server-admin/src/main/java/com/home/xining/controller/SendDocumentController.java
index fdab5b6..95e897f 100644
--- a/home-server-admin/src/main/java/com/home/xining/controller/SendDocumentController.java
+++ b/home-server-admin/src/main/java/com/home/xining/controller/SendDocumentController.java
@@ -98,7 +98,7 @@
return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
}
//鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.FWGZ.equals(fse.getTableName())) {
+ if (!CmnConst.FWGZ.equals(fse.getTableName())&&!CmnConst.SFGL.equals(fse.getTableName())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
}
diff --git a/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java b/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
index 704ec8f..b8e900b 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
@@ -51,7 +51,7 @@
filter = filter + " and " + queryFilterService.getQueryFilter(fs);
}
// fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)
- DataTableEntity dt = baseDao.listTable(CmnConst.APP_NOTICE_PUNISHMENT,filter, null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.APP_NOTICE_PUNISHMENT,filter, null,null," no00 desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
diff --git a/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java b/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java
index 50ca9d0..54be44e 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java
@@ -81,7 +81,7 @@
if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
filter = filter + " and " + queryFilterService.getQueryFilter(fs);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.GWJDSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.GWJDSPB,filter,null,null," gw00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
diff --git a/home-server-admin/src/main/java/com/home/xining/service/LawEnforcementService.java b/home-server-admin/src/main/java/com/home/xining/service/LawEnforcementService.java
index b676b6c..44e90c7 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/LawEnforcementService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/LawEnforcementService.java
@@ -50,7 +50,7 @@
if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
filter = filter + " and " + queryFilterService.getQueryFilter(fs);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.APP_XZZFSPB, filter, null, null, null, fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.APP_XZZFSPB, filter, null, null, " ax00 desc ", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
diff --git a/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java b/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java
index bc1804d..157913c 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/OfficeExpensesService.java
@@ -81,7 +81,7 @@
filter += " and "+dataFilter;
}
}
- 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;
}
diff --git a/home-server-admin/src/main/java/com/home/xining/service/OfficePurchaseService.java b/home-server-admin/src/main/java/com/home/xining/service/OfficePurchaseService.java
index 145c446..3c4f662 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/OfficePurchaseService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/OfficePurchaseService.java
@@ -84,7 +84,7 @@
if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
filter = filter + " and " + queryFilterService.getQueryFilter(fs);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.BGSYPCGB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.BGSYPCGB,filter,null,null," bg00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
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
*/
diff --git a/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java b/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java
index 9c19a98..23f8347 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java
@@ -77,7 +77,7 @@
if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
filter = filter + " and " + queryFilterService.getQueryFilter(fs);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null," ag00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
diff --git a/product-server-admin/src/main/java/com/product/admin/entity/MenuTreeEntity.java b/product-server-admin/src/main/java/com/product/admin/entity/MenuTreeEntity.java
index e5f1f81..313f677 100644
--- a/product-server-admin/src/main/java/com/product/admin/entity/MenuTreeEntity.java
+++ b/product-server-admin/src/main/java/com/product/admin/entity/MenuTreeEntity.java
@@ -472,7 +472,8 @@
if (menuEntities != null) {
if (0 == user_type) {
for (MenuEntity menuEntity : menuEntities) {
- if ("1".equals(menuEntity.getFunction_type())) {
+ //鏅�氱敤鎴峰厑璁歌闂殑鑿滃崟缁戝畾鐨勫姛鑳界被鍨�
+ if (StringUtils.equalsAny(menuEntity.getFunction_type(), "1", "5")) {
functionSet.add(menuEntity);
}
}
--
Gitblit v1.9.2