From de74af16c57961f01272dc595637e42f9a26405f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 21 Feb 2022 14:10:55 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/agency/editagency=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/EditAgencyFormDTO.java | 14 ++++++++++++++
 .../com/epmet/service/impl/AgencyServiceImpl.java  |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
index 7b3ff97ed8..7d7b6c70b5 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
@@ -89,4 +89,18 @@ public class EditAgencyFormDTO implements Serializable {
 
     @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddAgencyV2FormDTO.AddUserInternalGroup.class)
     private String level;
+
+    //02.21新增需求：小程序工作端添加组织增加中心点位置入口，点击进入地图选择点位，可以搜索，中心点为必填
+    //该接口为通用接口，后端暂时先不限制必填。由前端控制
+    /**
+     * 中心位置经度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
+    private String latitude;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 535d411b79..5c4e3f6727 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -158,7 +158,12 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setCode(formDTO.getCode());
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
-
+        if(StringUtils.isNotBlank(formDTO.getLatitude())){
+            originalEntity.setLatitude(formDTO.getLatitude());
+        }
+        if(StringUtils.isNotBlank(formDTO.getLongitude())){
+            originalEntity.setLongitude(formDTO.getLongitude());
+        }
         //当前客户开启了area_code_switch参数：open: 选择地区编码必填；closed:  无需选择地区编码
         if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
             CustomerAgencyEntity parent = customerAgencyDao.selectById(originalEntity.getPid());