修改审批状态 以及新增单位名称
This commit is contained in:
@ -15,6 +15,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import io.swagger.annotations.ApiParam;
|
import io.swagger.annotations.ApiParam;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.bind.annotation.*;
|
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) {
|
public BaseResponse<IPage<CoscoAccessWork>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
|
||||||
//判断当前登录人是否是组长
|
//判断当前登录人是否是组长
|
||||||
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
||||||
data.setOrgId(currentUser.getOrganizationId());
|
if(StringUtils.isEmpty(data.getOrgId())){
|
||||||
|
data.setOrgId(currentUser.getOrganizationId());
|
||||||
|
}
|
||||||
return BaseResponse.success(coscoAccessWorkService.getPage(data));
|
return BaseResponse.success(coscoAccessWorkService.getPage(data));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,6 +47,8 @@ public class CoscoMessageController extends BaseController {
|
|||||||
if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){
|
if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){
|
||||||
CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId());
|
CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId());
|
||||||
coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId());
|
coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId());
|
||||||
|
}else{
|
||||||
|
coscoMessage.setReceiverId(currentUser.getUserId());
|
||||||
}
|
}
|
||||||
return BaseResponse.success(coscoMessageService.getPage(coscoMessage));
|
return BaseResponse.success(coscoMessageService.getPage(coscoMessage));
|
||||||
}
|
}
|
||||||
|
@ -164,6 +164,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
|
|||||||
CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
|
CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
|
||||||
SysOrg org = orgService.getOrgInfo(coscoAccessWork.getDeptId());
|
SysOrg org = orgService.getOrgInfo(coscoAccessWork.getDeptId());
|
||||||
coscoAccessWork.setDeptName(org.getOrgName());
|
coscoAccessWork.setDeptName(org.getOrgName());
|
||||||
|
coscoAccessWork.setOrgName(org.getCuCompanyName());
|
||||||
vo.setCoscoAccessWork(coscoAccessWork);
|
vo.setCoscoAccessWork(coscoAccessWork);
|
||||||
|
|
||||||
//供应商信息
|
//供应商信息
|
||||||
|
Reference in New Issue
Block a user