From bb02c94a7f4675756c68be7980c4ed465c0e1f72 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 15 Jul 2020 19:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BC=81=E4=B8=9A=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=AD=98=E5=9C=A8=E6=A0=A1=E9=AA=8C-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/enterprise/dao/EnterpriseInfoDao.java     |  5 +++--
 .../service/impl/EnterpriseInfoServiceImpl.java       |  9 +++------
 .../resources/mapper/enterprise/EnterpriseInfoDao.xml | 11 +++++++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java
index 5b8549ab8..6c41a06a4 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java
@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
+import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
 import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,8 +77,8 @@ public interface EnterpriseInfoDao extends BaseDao<EnterpriseInfoEntity> {
 
     /**
      * 根据统一社会信用代码查询是否已存在该代码
-     * @param uniformSocialCreditCode
+     * @param fromDto
      * @return
      */
-    int getCountByCode(String uniformSocialCreditCode);
+    int getCountByCode(CompleteRequisiteInfoDTO fromDto);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
index e40129198..0678c862f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
@@ -140,12 +140,9 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
     @Transactional(rollbackFor = Exception.class)
     public Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto) {
         // 校验统一社会信用代码是否已存在数据库
-        String uniformSocialCreditCode = fromDto.getUniformSocialCreditCode();
-        if(StringUtils.isNotBlank(uniformSocialCreditCode)){
-            int count = baseDao.getCountByCode(uniformSocialCreditCode);
-            if(count > 0){
-                throw new RenException("您输入的统一社会信用代码已存在！");
-            }
+        int count = baseDao.getCountByCode(fromDto);
+        if(count > 0){
+            throw new RenException("您输入的统一社会信用代码已存在！");
         }
         //保存到企业数据库
         EnterpriseInfoEntity enterpriseInfo = ConvertUtils.sourceToTarget(fromDto, EnterpriseInfoEntity.class);
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
index 671da21c5..7fc086080 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
@@ -86,7 +86,14 @@
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
     </select>
-    <select id="getCountByCode">
-        select count(*) count from epdc_enterprise_info where UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode} and DEL_FLAG = '0'
+    <select id="getCountByCode" parameterType="com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO">
+        select
+        count(*) count
+        from epdc_enterprise_info
+        where UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode}
+        <if test="id != null and id != ''">
+            AND ID != #{id}
+        </if>
+        and DEL_FLAG = '0'
     </select>
 </mapper>
\ No newline at end of file