From a0707b8eb76490f2541ff4349f67512e68f24927 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期三, 24 五月 2023 17:43:26 +0800
Subject: [PATCH] 考勤相关调整
---
src/main/java/com/product/administration/service/CooperatesService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index 604ac64..ea7f0ed 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -307,12 +307,14 @@
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(" 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});
+ DataTableEntity dt = baseDao.listTable(str.toString(), new Object[]{user_id, 2}, fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ dt.getMeta().addAliasTable("product_oa_cooperates", "lc");
+ dt.getMeta().addAliasTable("product_oa_cooperate_flow_node", "lcn");
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2