修改配置文件

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java

@@ -273,7 +273,11 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
             }
         }
         SysOrg sysOrg = orgService.getOrgInfo(coscoCategoryLibrary.getApplyDeptId());
-        vo.setDeptName(sysOrg.getOrgName());
+        vo.setApplyDeptName(sysOrg.getOrgName());
+        vo.setApplyOrgName(sysOrg.getCuCompanyName());
+        SysOrg orgName = orgService.getOrgInfo(coscoCategoryLibrary.getDeptId());
+        vo.setDeptName(orgName.getOrgName());
+        vo.setOrgName(orgName.getCuCompanyName());
         vo.setCategoryName(sb.toString());
         vo.setCategoryPathName(categoryPathNames.toString());
         vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java

@@ -14,6 +14,12 @@ public class CoscoCategoryLibraryDetailVo extends CoscoCategoryLibrary {
 
     private String deptName;
 
+    private String applyDeptName;
+
+    private String applyOrgName;
+
+    private String orgName;
+
     private String createByName;
 
     private String categoryName;

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));
     }
 

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));
     }

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);
 
         //供应商信息

src/main/resources/application-dev.yml

@@ -35,6 +35,7 @@ spring:
     nacos:
       discovery:
         server-addr: 10.0.0.125:8848
+        namespace: EBTP_GROUP
   aop:
     auto: true #开启spring的aop配置
     proxy-target-class: true
@@ -52,6 +53,10 @@ spring:
         password: Unicom@2024
         jdbc-url: jdbc:mysql://59.110.10.99:53306/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
         url: jdbc:mysql://59.110.10.99:53306/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#        username: dev
+#        password: dev
+#        jdbc-url: jdbc:mysql://10.0.0.19:3308/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#        url: jdbc:mysql://10.0.0.19:3308/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
         filters: stat,wall,log4j
         maxActive: 20
         initialSize: 1
@@ -101,9 +106,9 @@ spring:
 
   # 天宫 redis 需要使用哨兵进行访问
   redis:
-    sentinel:
-      master: mymaster
-      nodes: 10.0.0.125:6379
+#    sentinel:
+#      master: mymaster
+#      nodes: 10.0.0.125:6379
     password:
     database:
       sharding: 1

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml

@@ -290,7 +290,7 @@
             <if test="vo.orgId!=null and vo.orgId!=''">
                 and cat.org_id = #{vo.orgId}
             </if>
-            and cat.level_name is not null
+            and cats.review_result is not null
         </where>
 
         order by cats.create_time desc

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml

@@ -29,6 +29,7 @@
         select id,
                name,
                apply_dept_id,
+               apply_org_id,
                approve_type,
                org_id,
                term_of_validity,