From 1cae2dc30c82c9f67bdc56f8bec077d03a614ea0 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Sat, 21 Sep 2019 14:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=9A=E5=A7=94=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/SysDeptService.java     |  9 +++++++
 .../epdc/service/impl/SysDeptServiceImpl.java | 27 ++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 86f225b6d..4d0572dc1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -92,4 +92,13 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @date 2019/9/20 19:57
      */
     Map<String, String> getIdByCode(String partyCode);
+
+    /***
+     * 校验编码是否重复
+     * @param dto
+     * @return java.lang.Integer
+     * @author qushutong
+     * @date 2019/9/21 14:14
+     */
+    Integer getCodeCount(SysDeptDTO dto);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 931835137..d9ce85cc4 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -91,6 +91,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysDeptDTO dto) {
+        String partyCode = dto.getPartyCode();
+        if (StringUtils.isNotBlank(partyCode)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
 
         entity.setPids(getPidList(entity.getPid()));
@@ -100,6 +106,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(SysDeptDTO dto) {
+        String partyCode = dto.getPartyCode();
+        if (StringUtils.isNotBlank(partyCode)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
 
         //上级部门不能为自身
@@ -210,11 +222,20 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public Map<String, String> getIdByCode(String partyCode) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
         wrapper.select("id");
-        wrapper.eq("party_code",partyCode);
+        wrapper.eq("party_code", partyCode);
         SysDeptEntity sysDeptEntity = baseDao.selectOne(wrapper);
-        Map<String, String> map=new HashMap<>();
-        map.put("id",sysDeptEntity.getId().toString());
+        Map<String, String> map = new HashMap<>();
+        map.put("id", sysDeptEntity.getId().toString());
         return map;
     }
 
+    @Override
+    public Integer getCodeCount(SysDeptDTO dto) {
+        QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("party_code", dto.getPartyCode());
+        Long id = dto.getId();
+        wrapper.ne(id!=null, "id", dto.getId());
+        return baseDao.selectCount(wrapper);
+    }
+
 }