From 392cc2b26980fb35462674b53294e9d540716e2c Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 5 Jan 2021 13:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=96=B0=E5=A2=9E=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/SysDeptDTO.java   | 20 ++++++++++++----
 .../elink/esua/epdc/entity/SysDeptEntity.java |  5 ++++
 .../esua/epdc/service/SysDeptService.java     |  9 +++++++
 .../epdc/service/impl/SysDeptServiceImpl.java | 24 +++++++++++++++++++
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
index 3d5d9d58..556cecc1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
@@ -16,10 +16,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -67,6 +64,13 @@ public class SysDeptDTO extends TreeNode implements Serializable {
      */
     private String partyCode;
 
+    /**
+     * 区域编码
+     */
+    @NotBlank(message = "区域编码不能为空且在50字以内", groups = DefaultGroup.class)
+    @Size(min = 1, max = 50, message = "区域编码不能为空且在50字以内")
+    private String areaCode;
+
     public String getPartyCode() {
         return partyCode;
     }
@@ -134,4 +138,12 @@ public class SysDeptDTO extends TreeNode implements Serializable {
     public void setPid(Long pid) {
         this.pid = pid;
     }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
index 5e90ca0f..4b83b09e 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
@@ -79,4 +79,9 @@ public class SysDeptEntity extends BaseEntity {
      */
     private String partyCode;
 
+    /**
+     * 区域编码
+     */
+    private String areaCode;
+
 }
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 ae5168f9..93010c37 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
@@ -114,6 +114,15 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     Integer getCodeCount(SysDeptDTO dto);
 
+    /***
+     * 校验区域编码是否重复
+     * @param dto
+     * @return java.lang.Integer
+     * @author qushutong
+     * @date 2019/9/21 14:14
+     */
+    Integer getAreaCodeCount(SysDeptDTO dto);
+
     /**
      * 通过网格id集合，获取网格长管理的所有网格
      *
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 2fd53574..1dbb5b7b 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
@@ -127,6 +127,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 throw new RenException("您输入的编码已存在");
             }
         }
+
+        String areaCode = dto.getAreaCode();
+        if (StringUtils.isNotBlank(areaCode)) {
+            if (getAreaCodeCount(dto) > 0) {
+                throw new RenException("您输入的区域编码已存在");
+            }
+        }
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
 
         entity.setPids(getPidList(entity.getPid()));
@@ -149,6 +156,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 throw new RenException("您输入的编码已存在");
             }
         }
+
+        String areaCode = dto.getAreaCode();
+        if (StringUtils.isNotBlank(areaCode)) {
+            if (getAreaCodeCount(dto) > 0) {
+                throw new RenException("您输入的区域编码已存在");
+            }
+        }
+
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
 
         //上级部门不能为自身
@@ -321,6 +336,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return baseDao.selectCount(wrapper);
     }
 
+    @Override
+    public Integer getAreaCodeCount(SysDeptDTO dto) {
+        QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("area_code", dto.getAreaCode());
+        Long id = dto.getId();
+        wrapper.ne(id != null, "id", dto.getId());
+        return baseDao.selectCount(wrapper);
+    }
+
     @Override
     public Result<String> getParentDeptIds(Long deptId) {
         return new Result<String>().ok(getPidList(deptId));