From 36964d44475e3d3461289e1816b62f6c41c34577 Mon Sep 17 00:00:00 2001
From: xiangZr-hhh <“2774915446@qq.com”>
Date: Fri, 12 Apr 2024 19:07:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=A1=E6=81=AF=E3=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加审核信息接口：增加判断审核名称是否重复
获取审核信息接口：在子模块名称为空时，返回无，而不是返回null
---
 src/main/java/com/jsl/oa/mapper/ReviewMapper.java          | 2 ++
 .../java/com/jsl/oa/services/impl/ReviewServiceImpl.java   | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/jsl/oa/mapper/ReviewMapper.java b/src/main/java/com/jsl/oa/mapper/ReviewMapper.java
index 144a832..16dac5c 100644
--- a/src/main/java/com/jsl/oa/mapper/ReviewMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/ReviewMapper.java
@@ -36,4 +36,6 @@ public interface ReviewMapper {
 
     void addReview(ReviewDO reviewDO);
 
+    @Select("SELECT * FROM  organize_oa.oa_review WHERE name = #{name} AND is_delete = 0")
+    List<ReviewDO> selectReviewByName(String name);
 }
diff --git a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
index 4e7993b..e92f5e0 100644
--- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
@@ -153,6 +153,11 @@ public class ReviewServiceImpl implements ReviewService {
         //获取用户
         Long userId = Processing.getAuthHeaderToUserId(request);
 
+        //检查审核事项名称是否重复
+        if (!reviewDAO.checkNameIsExist(reviewAddVO.getName())) {
+            return ResultUtil.error(ErrorCode.REVIEW_NAME_REPEAT);
+        }
+
         //定义要添加的审核实体类
         ReviewDO reviewDO = new ReviewDO();
         //现将属性相同的值拷贝
@@ -225,6 +230,8 @@ public class ReviewServiceImpl implements ReviewService {
             }
             if (reviewDO.getProjectSubmoduleId() != null) {
                 reviewVO.setSubmoduleName(reviewDAO.getNameBySubproject(reviewDO.getProjectSubmoduleId()));
+            } else {
+                reviewVO.setSubsystemName("无");
             }
 //            将封装好的结果添加到结果集
             resultData.add(reviewVO);