From 22d8b68b19e35bdd2086fd047296abe440639f32 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期四, 18 九月 2025 15:52:27 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/administration/service/CooperatesService.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index db00d55..69df92c 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -17,6 +17,8 @@
 import com.product.core.websocket.service.WebsocketMesssageServiceThread;
 import com.product.module.sys.service.UserService;
 import com.product.util.BaseUtil;
+import com.product.util.UnifySQLFunction;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.product.tool.flow.service.FlowCoordinationService;
@@ -87,9 +89,13 @@
 			}
 		}
 		StringBuilder stringBuilder = new StringBuilder();
-		stringBuilder.append(" select ifnull(concat(tricode,'-',receiver) ,receiver) code,uuid,title,cooperate_uuid,grade,receiver as id,receiver,sender, ");
-		stringBuilder.append(" receiver_name,(select user_name FROM product_sys_users where user_id=receiver) label,sender_name,status, ");
-		stringBuilder.append(" tricode,opinion,handle_time,type,attachments,is_hide_commentss from product_oa_cooperate_flow_node where cooperate_uuid=? ORDER BY tricode ");
+		stringBuilder.append("\nSELECT ");
+		stringBuilder.append("\n  uuid,title,cooperate_uuid,grade,receiver as id,receiver,sender,receiver_name,sender_name,status, ");
+		stringBuilder.append("\n  tricode,opinion,handle_time,type,attachments,is_hide_commentss, ");
+		stringBuilder.append("\n  (select user_name FROM product_sys_users where user_id=receiver) label,");
+		stringBuilder.append("\n  ").append(UnifySQLFunction.ifnull("concat(tricode,'-',receiver)", "receiver")).append(" AS code");
+		stringBuilder.append("\nFROM product_oa_cooperate_flow_node where cooperate_uuid=? ");
+		stringBuilder.append("\nORDER BY tricode ");
 		DataTableEntity dt = baseDao.listTable(stringBuilder.toString(), new Object[]{fs.getString("uuid")});
 		JSONArray json = null;
 		if (dt != null && dt.getRows() > 0) {

--
Gitblit v1.9.2