From dcee90fe7bdb096806a0b57a49ecdf3a3979b8ba Mon Sep 17 00:00:00 2001
From: TL <2445390702@qq.com>
Date: Mon, 11 Aug 2025 17:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=20=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coscosupplier/controller/CoscoAccessWorkController.java  | 5 ++++-
 .../coscosupplier/controller/CoscoMessageController.java     | 2 ++
 .../service/impl/CoscoAccessWorkCategoryServiceImpl.java     | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
index 025c4af..fd8f8e4 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
@@ -15,6 +15,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -40,7 +41,9 @@ public class CoscoAccessWorkController extends BaseController {
     public BaseResponse<IPage<CoscoAccessWork>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
         //判断当前登录人是否是组长
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        data.setOrgId(currentUser.getOrganizationId());
+        if(StringUtils.isEmpty(data.getOrgId())){
+            data.setOrgId(currentUser.getOrganizationId());
+        }
         return BaseResponse.success(coscoAccessWorkService.getPage(data));
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
index a09e518..19b460a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
@@ -47,6 +47,8 @@ public class CoscoMessageController extends BaseController {
         if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){
             CoscoSupplierUser coscoSupplierUser =  coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId());
             coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId());
+        }else{
+            coscoMessage.setReceiverId(currentUser.getUserId());
         }
         return BaseResponse.success(coscoMessageService.getPage(coscoMessage));
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
index f7f4e68..fa90891 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
@@ -164,6 +164,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
         CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
         SysOrg org = orgService.getOrgInfo(coscoAccessWork.getDeptId());
         coscoAccessWork.setDeptName(org.getOrgName());
+        coscoAccessWork.setOrgName(org.getCuCompanyName());
         vo.setCoscoAccessWork(coscoAccessWork);
 
         //供应商信息