From 054625ce1c40468d0d052369d1de6e0edb8d7ce8 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期四, 13 七月 2023 17:51:39 +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 | 4 ++--
1 files changed, 2 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 1d09e12..26eea79 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -318,10 +318,10 @@
str.append("SELECT * FROM ( ");
str.append(" select lc.*,lcn.uuid flow_node_uuid from product_oa_cooperate_flow_node as lcn LEFT JOIN product_oa_cooperates as lc ");
str.append(" on lc.uuid=lcn.cooperate_uuid where lcn.receiver=? and lcn.status=? and sender_name is not null ");
- str.append(" ) a");
if (!StringUtils.isEmpty(queryFilter)) {
- str.append(" where ").append(queryFilter);
+ str.append(" and ").append(queryFilter);
}
+ str.append(" ) a");
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");
--
Gitblit v1.9.2