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/CooperatesService.java | 13 ++++++++-----
1 files changed, 8 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 b1d3f2b..db00d55 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,9 +15,9 @@
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 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;
@@ -35,7 +34,6 @@
* @author: ZhouJie
* @Description: 鍗忓悓鍔炲叕
*/
-@Component
@Service
public class CooperatesService extends AbstractBaseService implements ICooperatesService {
@Autowired
@@ -47,7 +45,6 @@
@Autowired
QueryFilterService queryFilterService;
@Autowired
- @Qualifier("userOperService")
UserService userService;
/**
@@ -82,7 +79,13 @@
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, ");
--
Gitblit v1.9.2