From 980f18fc2898ba07670dd1de4f8354f815d628fb Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期三, 01 十月 2025 10:43:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev
---
src/main/java/com/product/administration/service/CooperateModelService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperateModelService.java b/src/main/java/com/product/administration/service/CooperateModelService.java
index 4f6f0ef..0888120 100644
--- a/src/main/java/com/product/administration/service/CooperateModelService.java
+++ b/src/main/java/com/product/administration/service/CooperateModelService.java
@@ -44,11 +44,11 @@
String curUserID = SpringMVCContextHolder.getCurrentUserId();
StringBuilder sql = new StringBuilder(256);
sql.append("\nselect uuid,name,date_format(created_utc_datetime,'%Y-%m-%d %H:%i:%s') created_utc_datetime,created_by,type from (");
- sql.append("\n select uuid,name,created_utc_datetime,created_by,0 type from product_oa_cooperates_template where created_by=? and created_by<>1");
+ sql.append("\n select uuid,name,created_utc_datetime,created_by,0 as type from product_oa_cooperates_template where created_by=? and created_by<>1");
sql.append("\n union all");
- sql.append("\n select uuid,name,created_utc_datetime,created_by,1 type from product_oa_cooperates_template where find_in_set(?,share_user)>0 and created_by<>1 and created_by<>?");
+ sql.append("\n select uuid,name,created_utc_datetime,created_by,1 as type from product_oa_cooperates_template where find_in_set(?,share_user)>0 and created_by<>1 and created_by<>?");
sql.append("\n union all");
- sql.append("\n select uuid,name,created_utc_datetime,created_by,2 type from product_oa_cooperates_template where created_by=1");
+ sql.append("\n select uuid,name,created_utc_datetime,created_by,2 as type from product_oa_cooperates_template where created_by=1");
sql.append("\n) t");
sql.append("\norder by created_utc_datetime desc");
return baseDao.listTable(sql.toString(), new Object[]{curUserID, curUserID, curUserID});
--
Gitblit v1.9.2