|
|
@@ -88,19 +88,16 @@ public class ProjectApprovalController {
|
|
|
WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, companyId));
|
|
|
List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
|
|
|
List<ProjectCategory> categoryList = projectCategoryService.list(new LambdaQueryWrapper<ProjectCategory>().eq(ProjectCategory::getCompanyId, companyId));
|
|
|
- projectApproval.setCompanyId(companyId);
|
|
|
- projectApproval.setCreateDate(LocalDate.now());
|
|
|
- projectApproval.setCreatorId(user.getId());
|
|
|
+ if(projectApproval.getId()==null){
|
|
|
+ projectApproval.setCompanyId(companyId);
|
|
|
+ projectApproval.setCreateDate(LocalDate.now());
|
|
|
+ projectApproval.setCreatorId(user.getId());
|
|
|
+ }
|
|
|
Optional<ProjectCategory> category = categoryList.stream().filter(c -> c.getId().equals(projectApproval.getCategory())).findFirst();
|
|
|
if(category.isPresent()){
|
|
|
projectApproval.setCategoryName(category.get().getName());
|
|
|
}
|
|
|
- Integer count;
|
|
|
- if(projectApproval.getId()==null){
|
|
|
- count = projectMapper.selectCount(new LambdaQueryWrapper<Project>().eq(Project::getCompanyId, companyId).eq(Project::getProjectCode, projectApproval.getProjectCode()));
|
|
|
- }else {
|
|
|
- count = projectMapper.selectCount(new LambdaQueryWrapper<Project>().ne(Project::getId,projectApproval.getId()).eq(Project::getCompanyId, companyId).eq(Project::getProjectCode, projectApproval.getProjectCode()));
|
|
|
- }
|
|
|
+ Integer count=projectMapper.selectCount(new LambdaQueryWrapper<Project>().eq(Project::getCompanyId, companyId).eq(Project::getProjectCode, projectApproval.getProjectCode()));
|
|
|
if(count>0){
|
|
|
msg.setError("已存在项目编号为["+projectApproval.getProjectCode()+"]的项目");
|
|
|
return msg;
|
Min