Merge remote-tracking branch 'origin/dev_govorg' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -32,7 +32,9 @@ public enum EpmetErrorCode {
 	NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),
 	NOT_DEL_DEPARTMENT(8206, "该部门存在工作人员，不允许删除"),
 
-	REQUIRE_PERMISSION(8301, "没有足够的操作权限");
+	REQUIRE_PERMISSION(8301, "没有足够的操作权限"),
+
+	NOT_ADD_GRID(8401,"您当前的网格名称已存在，请重新修改");
 
 
 	private int code;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java

@@ -18,6 +18,11 @@ public class EditGridFormDTO implements Serializable {
      */
     private String gridId;
 
+    /**
+     * pid 当前机关id
+     */
+    private String agencyId;
+
     /**
      * 网格名称
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -110,7 +110,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @param gridName
      * @return
      */
-    String selectGridIdByGridName(@Param("gridName")String gridName);
+    String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid);
 
     /**
      * 编辑网格信息

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -186,6 +186,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<AddGridResultDTO> addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) {
+        String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId());
+        if (checkGridName!=null){
+            return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
+        }
         CustomerGridEntity customerGridEntity = new CustomerGridEntity();
         customerGridEntity.setCustomerId(baseDao.selectCustomerIdByUserId(tokenDto.getUserId()));
         customerGridEntity.setGridName(addGridFormDTO.getGridName());
@@ -197,7 +201,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setPid(addGridFormDTO.getAgencyId());
         customerGridEntity.setPids(baseDao.selectPidsByPid(addGridFormDTO.getAgencyId()));
         baseDao.insert(customerGridEntity);
-        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName());
+        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId());
         AddGridResultDTO addGridResultDTO = new AddGridResultDTO();
         addGridResultDTO.setGridId(gridId);
         return new Result<AddGridResultDTO>().ok(addGridResultDTO);
@@ -211,6 +215,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result editGrid(TokenDto tokenDto, EditGridFormDTO editGridFormDTO) {
+        String checkGridName = baseDao.selectGridIdByGridName(editGridFormDTO.getGridName(),editGridFormDTO.getAgencyId());
+        if (checkGridName!=null){
+            return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
+        }
         CustomerGridDTO customerGridDTO = new CustomerGridDTO();
         customerGridDTO.setManageDistrict(editGridFormDTO.getManageDistrict());
         customerGridDTO.setGridName(editGridFormDTO.getGridName());

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -24,8 +24,8 @@
     <!-- 查询客户对应的根级组织 -->
     <select id="selectStaffOrgList" parameterType="map" resultType="com.epmet.dto.result.StaffOrgsResultDTO">
         SELECT
-            ca.pid AS agencyId,
-            ca.ORGANIZATION_NAME AS agencyName,
+            ca.pid AS rootAgencyId,
+            ca.ORGANIZATION_NAME AS rootAgencyName,
             ca.CUSTOMER_ID AS customerId
         FROM
             customer_agency ca

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -168,6 +168,7 @@
             customer_grid
         WHERE
             grid_name = #{gridName}
+            AND pid = #{agencyId}
             AND del_flag = 0
     </select>