WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 推送至业务 #17

Merged
XiaoLFeng merged 46 commits from develop into master 2024-04-17 00:55:37 +08:00
Conversation 0 Commits 46 Files Changed 116 +9
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36964d4447 - Show all commits

2
src/main/java/com/jsl/oa/mapper/ReviewMapper.java
View File

@ -36,4 +36,6 @@ public interface ReviewMapper {
void addReview(ReviewDO reviewDO); void addReview(ReviewDO reviewDO);
@Select("SELECT * FROM organize_oa.oa_review WHERE name = #{name} AND is_delete = 0")
List<ReviewDO> selectReviewByName(String name);
} }

7
src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
View File

@ -153,6 +153,11 @@ public class ReviewServiceImpl implements ReviewService {
//获取用户 //获取用户
Long userId = Processing.getAuthHeaderToUserId(request); Long userId = Processing.getAuthHeaderToUserId(request);
//检查审核事项名称是否重复
if (!reviewDAO.checkNameIsExist(reviewAddVO.getName())) {
return ResultUtil.error(ErrorCode.REVIEW_NAME_REPEAT);
}
//定义要添加的审核实体类 //定义要添加的审核实体类
ReviewDO reviewDO = new ReviewDO(); ReviewDO reviewDO = new ReviewDO();
//现将属性相同的值拷贝 //现将属性相同的值拷贝
@ -225,6 +230,8 @@ public class ReviewServiceImpl implements ReviewService {
} }
if (reviewDO.getProjectSubmoduleId() != null) { if (reviewDO.getProjectSubmoduleId() != null) {
reviewVO.setSubmoduleName(reviewDAO.getNameBySubproject(reviewDO.getProjectSubmoduleId())); reviewVO.setSubmoduleName(reviewDAO.getNameBySubproject(reviewDO.getProjectSubmoduleId()));
} else {
reviewVO.setSubsystemName("无");
} }
// 将封装好的结果添加到结果集 // 将封装好的结果添加到结果集
resultData.add(reviewVO); resultData.add(reviewVO);