From d98e1a97749b812282a9e605a01d47d08be1b633 Mon Sep 17 00:00:00 2001
From: zhangfh <jyyzzfh@126.com>
Date: Sat, 21 Aug 2021 16:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=A4=A7=E5=B1=8F=20?=
 =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=B1=BB=E5=9E=8B=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=20admin=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java | 11 +++++++++++
 .../elink/esua/epdc/entity/PartyOrgTypeEntity.java    |  7 +++++++
 .../epdc/service/impl/PartyOrgTypeServiceImpl.java    |  6 ++++--
 .../src/main/resources/mapper/PartyOrgTypeDao.xml     | 11 +++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
index 61ebd3d..980e8c3 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java
@@ -56,6 +56,17 @@ public interface PartyOrgTypeDao extends BaseDao<PartyOrgTypeEntity> {
      **/
     Integer isTypeNameRepeated(@Param("typeName") String typeName, @Param("id") String id);
 
+    /**
+     * 返回值 >0 图标 已经存在
+     *
+     * @param typeName
+     * @param id        过滤自身(可选项)
+     * @return java.lang.Integer
+     * @Author zhangfenghe
+     * @Date 13:36 2021-08-21
+     **/
+    Integer isTypeImgRepeated(@Param("imgUrl") String typeName, @Param("id") String id);
+
     /*
      * 获取 党组织类型，用于下拉选项
      * @param
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java
index 97a832b..3d6ef38 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java
@@ -58,4 +58,11 @@ public class PartyOrgTypeEntity extends BaseEpdcEntity {
      */
 	private String enable;
 
+	/**
+	 * 党组织类型图标
+	 */
+	private String imgUrl;
+
+
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
index f39b9a1..7840408 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java
@@ -93,7 +93,8 @@ public class PartyOrgTypeServiceImpl extends BaseServiceImpl<PartyOrgTypeDao, Pa
         this.exceptionHandling(num, "党组织类型编码");
         num = baseDao.isTypeNameRepeated(dto.getTypeName(), null);
         this.exceptionHandling(num, "党组织类型");
-
+        num = baseDao.isTypeImgRepeated(dto.getImgUrl(),null);
+        this.exceptionHandling(num,"党组织类型图标");
         PartyOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgTypeEntity.class);
         insert(entity);
     }
@@ -105,7 +106,8 @@ public class PartyOrgTypeServiceImpl extends BaseServiceImpl<PartyOrgTypeDao, Pa
         this.exceptionHandling(num, "党组织类型编码 不可重复！");
         num = baseDao.isTypeNameRepeated(dto.getTypeName(), dto.getId());
         this.exceptionHandling(num, "党组织类型 不可重复！");
-
+        num = baseDao.isTypeImgRepeated(dto.getImgUrl(),dto.getId());
+        this.exceptionHandling(num,"党组织图标，不可重复");
         PartyOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgTypeEntity.class);
         updateById(entity);
     }
diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
index 7af2277..f46014c 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml
@@ -39,6 +39,17 @@
         </if>
     </select>
 
+    <select id="isTypeImgRepeated" resultType="Integer">
+        SELECT
+        COUNT(1)
+        FROM epdc_party_org_type
+        WHERE DEL_FLAG = '0'
+        AND IMG_URL = #{imgUrl}
+        <if test="id != null and id.trim() != ''">
+            AND ID != #{id}
+        </if>
+    </select>
+
     <select id="getPartyOrgType" resultType="com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO">
         SELECT
             TYPE_CODE tagValue,