校验服务机构是否已存在

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/SrvOrganServiceImpl.java

@@ -22,7 +22,6 @@ import com.hungraim.ltc.util.ResultCode;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,8 +46,7 @@ public class SrvOrganServiceImpl implements SrvOrganService {
 
     private final AttachFeignService attachFeignService;
 
-    @Autowired
-    private ChSrvorganRiskLevelMapper chSrvorganRiskLevelMapper;
+    private final ChSrvorganRiskLevelMapper chSrvorganRiskLevelMapper;
 
 
     @Override
@@ -106,9 +104,12 @@ public class SrvOrganServiceImpl implements SrvOrganService {
             // 添加操作
             //校验服务机构是否已存在
             ChSrvOrgan selectOrgan = srvOrganMapper.selectOne(new LambdaQueryWrapper<ChSrvOrgan>()
-                    .eq(ChSrvOrgan::getOrganId, srvOrganVo.getOrganId())
+                    .eq(ChSrvOrgan::getUnifiedSocialCreditCode, srvOrganVo.getUnifiedSocialCreditCode())
                     .eq(ChSrvOrgan::getStatus, 0));
-            if (selectOrgan != null) {
+            ChSrvOrgan selectOrgan1 = srvOrganMapper.selectOne(new LambdaQueryWrapper<ChSrvOrgan>()
+                    .eq(ChSrvOrgan::getPermitId, srvOrganVo.getPermitId())
+                    .eq(ChSrvOrgan::getStatus, 0));
+            if (selectOrgan != null || selectOrgan1 != null) {
                 throw new RuntimeException("服务机构已存在,请不要重复添加");
             }
             chSrvOrgan.setStatus(0);