From 4ffa18271cc8e710980de176ea0b6b38eb0679ec Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期三, 24 五月 2023 09:28:57 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/CooperatesService.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index 388d33c..806cf4f 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -56,25 +56,21 @@
* @Description: 鍗忓悓鍔炲叕鍒楄〃
*/
public DataTableEntity getCooperateList(FieldSetEntity fs) throws BaseException {
- String queryFilter;
- if (BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
- queryFilter = "";
- } else {
- queryFilter = queryFilterService.getQueryFilter(fs) + " and ";
- }
- String filter = queryFilter + " created_by = ? ";
- int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
- String sta = fs.getString("status");
- String[] status = sta.split(",");
- if (!StringUtils.isEmpty(sta)) {
- filter += " and " + BaseUtil.buildQuestionMarkFilter("status", status.length, true);
- }
- List<Object> params = new ArrayList<Object>();
- params.add(user_id);
- params.addAll(Arrays.asList(status));
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_COOPERATES, filter, params.toArray(), null, CmnConst.CREATED_UTC_DATETIME+" DESC", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
- baseDao.loadPromptData(dt);
- return dt;
+ String queryFilter = BaseUtil.ifNull(BaseUtil.ifNotNull(queryFilterService.getQueryFilter(fs), (value) -> value + " and "), "");
+
+ String filter = queryFilter + " created_by = ? ";
+ int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
+ String sta = fs.getString("status");
+ String[] status = sta.split(",");
+ if (!StringUtils.isEmpty(sta)) {
+ filter += " and " + BaseUtil.buildQuestionMarkFilter("status", status.length, true);
+ }
+ List<Object> params = new ArrayList<Object>();
+ params.add(user_id);
+ params.addAll(Arrays.asList(status));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_COOPERATES, filter, params.toArray(), null, CmnConst.CREATED_UTC_DATETIME + " DESC", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ baseDao.loadPromptData(dt);
+ return dt;
}
/**
@@ -309,13 +305,19 @@
*/
public DataTableEntity getNowUserList(FieldSetEntity fs) {
int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
+ String queryFilter = queryFilterService.getQueryFilter(fs);
StringBuffer str = new StringBuffer();
str.append(" select lc.*,lcn.uuid flow_node_uuid from product_oa_cooperate_flow_node lcn LEFT JOIN product_oa_COOPERATEs lc ");
str.append(" on lc.uuid=lcn.cooperate_uuid where lcn.receiver=? and lcn.status=? and sender_name is not null ");
+ if (!StringUtils.isEmpty(queryFilter)) {
+ str.append(" and ").append(queryFilter);
+ }
DataTableEntity dt = baseDao.listTable(str.toString(), new Object[]{user_id, 2});
+ dt.getMeta().addAliasTable("product_oa_COOPERATEs", "lc");
+ dt.getMeta().addAliasTable("product_oa_cooperate_flow_node", "lcn");
baseDao.loadPromptData(dt);
return dt;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2