From de8e6ce8799342f58f80a5a0ad0b92d218cfbe87 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 24 五月 2023 19:57:31 +0800
Subject: [PATCH] 协同个人已办
---
src/main/java/com/product/administration/service/CooperatesService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index 91f339d..ab7811f 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -1,5 +1,6 @@
package com.product.administration.service;
+import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONArray;
import com.product.admin.service.UserService;
import com.product.administration.config.CmnConst;
@@ -8,6 +9,7 @@
import com.product.core.config.CoreConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
+import com.product.core.entity.FieldMetaEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
@@ -305,14 +307,14 @@
*/
public DataTableEntity getNowUserList(FieldSetEntity fs) {
int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
- fs.getMeta().addAliasTable("product_oa_cooperates", "lc");
- fs.getMeta().addAliasTable("product_oa_cooperate_flow_node", "lcn");
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 * 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(" and ").append(queryFilter);
+ str.append(" where ").append(queryFilter);
}
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");
--
Gitblit v1.9.2