From 4ffa18271cc8e710980de176ea0b6b38eb0679ec Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期三, 24 五月 2023 09:28:57 +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/CooperateModelService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperateModelService.java b/src/main/java/com/product/administration/service/CooperateModelService.java
index fd17ae5..4f6f0ef 100644
--- a/src/main/java/com/product/administration/service/CooperateModelService.java
+++ b/src/main/java/com/product/administration/service/CooperateModelService.java
@@ -43,12 +43,12 @@
public DataTableEntity listModel(FieldSetEntity fse) {
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,type from (");
- sql.append("\n select uuid,name,created_utc_datetime,0 type from product_oa_cooperates_template where created_by=? and created_by<>1");
+ 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 union all");
- sql.append("\n select uuid,name,created_utc_datetime,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 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,2 type from product_oa_cooperates_template where created_by=1");
+ 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) t");
sql.append("\norder by created_utc_datetime desc");
return baseDao.listTable(sql.toString(), new Object[]{curUserID, curUserID, curUserID});
--
Gitblit v1.9.2