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 | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index b1d3f2b..d7a6f24 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -1,7 +1,6 @@
package com.product.administration.service;
import com.alibaba.fastjson.JSONArray;
-import com.product.admin.service.UserService;
import com.product.administration.config.CmnConst;
import com.product.administration.service.ide.ICooperatesService;
import com.product.common.lang.StringUtils;
@@ -16,10 +15,11 @@
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.core.transfer.Transactional;
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.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
import com.product.tool.flow.service.FlowCoordinationService;
import org.springframework.stereotype.Service;
@@ -35,7 +35,6 @@
* @author: ZhouJie
* @Description: 鍗忓悓鍔炲叕
*/
-@Component
@Service
public class CooperatesService extends AbstractBaseService implements ICooperatesService {
@Autowired
@@ -47,7 +46,6 @@
@Autowired
QueryFilterService queryFilterService;
@Autowired
- @Qualifier("userOperService")
UserService userService;
/**
@@ -82,11 +80,21 @@
FieldSetEntity fse = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_COOPERATES, fs.getString(CmnConst.UUID), true);
DataTableEntity copsub = fse.getSubDataTable(CmnConst.PRODUCT_OA_COOPERATE_SUB);
baseDao.loadPromptData(copsub);
-
+ for (int i = 0; i <copsub.getRows() ; i++) {
+ String userId = copsub.getString(i, "created_by_save_value");
+ String userAvatar = userService.getUserAvatar(userId);
+ if (!StringUtils.isEmpty(userAvatar)) {
+ copsub.setFieldValue(i, "avatar", userAvatar);
+ }
+ }
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)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