Merge remote-tracking branch '99/dev' into 99dev

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