From 15cb14e5d1fe955df8d1b73c2c6c8ca768a64441 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 24 九月 2025 17:48:54 +0800
Subject: [PATCH] 代码提交

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

diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index 69df92c..d7a6f24 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -20,7 +20,6 @@
 import com.product.util.UnifySQLFunction;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import com.product.tool.flow.service.FlowCoordinationService;
 
 import org.springframework.stereotype.Service;
@@ -92,10 +91,10 @@
 		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 ");
+		stringBuilder.append("\n  (select user_name FROM product_sys_users where user_id=receiver)AS label,");
+		stringBuilder.append("\n  ").append(UnifySQLFunction.ifnull(UnifySQLFunction.concatNullFunction("tricode", "'-'", "receiver"), "receiver::TEXT", "code"));
+		stringBuilder.append("\nFROM product_oa_cooperate_flow_node where cooperate_uuid = ? ");
+		stringBuilder.append("\nORDER BY code");
 		DataTableEntity dt = baseDao.listTable(stringBuilder.toString(), new Object[]{fs.getString("uuid")});
 		JSONArray json = null;
 		if (dt != null && dt.getRows() > 0) {

--
Gitblit v1.9.2