From 19d5cfbb8756ebe40cb6152d68d194531f40e603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 6 Mar 2020 18:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E6=A0=87=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/consult/result/CheckStateResultDTO.java     | 1 +
 .../modules/consult/entity/MajorFunctionConfEntity.java  | 5 +++++
 .../service/impl/MajorFunctionConfServiceImpl.java       | 9 ++++++++-
 .../resources/mapper/consult/MajorFunctionConfDao.xml    | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java
index 3341766d1..1c445102b 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java
@@ -24,5 +24,6 @@ public class CheckStateResultDTO implements Serializable {
     private String externalFlag;
     private String externalUrl;
     private String name;
+    private String imgUrl;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/MajorFunctionConfEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/MajorFunctionConfEntity.java
index 0d608a89a..be9f13119 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/MajorFunctionConfEntity.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/MajorFunctionConfEntity.java
@@ -68,4 +68,9 @@ public class MajorFunctionConfEntity extends BaseEpdcEntity {
      */
 	private String remark;
 
+	/**
+	 * 图标
+	 */
+	private String imgUrl;
+
 }
\ 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/consult/service/impl/MajorFunctionConfServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java
index 057af702e..aeaa304b4 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java
@@ -92,7 +92,7 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl<MajorFunctionC
 
         Integer integer = baseDao.selectCount(queryWrapper);
         if (integer > 0) {
-            throw new RenException("功能编码重复");
+            throw new RenException("功能编码已存在");
         }
         insert(entity);
     }
@@ -101,6 +101,13 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl<MajorFunctionC
     @Transactional(rollbackFor = Exception.class)
     public void update(MajorFunctionConfDTO dto) {
         MajorFunctionConfEntity entity = ConvertUtils.sourceToTarget(dto, MajorFunctionConfEntity.class);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotBlank(dto.getCode()), "code", dto.getCode());
+
+        Integer integer = baseDao.selectCount(queryWrapper);
+        if (integer > 0) {
+            throw new RenException("功能编码已存在，不允许修改");
+        }
         updateById(entity);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/MajorFunctionConfDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/MajorFunctionConfDao.xml
index de6e5f17a..2f1963577 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/MajorFunctionConfDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/MajorFunctionConfDao.xml
@@ -17,6 +17,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="imgUrl" column="img_url"/>
     </resultMap>