网格名称修改bug修复

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

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

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

@@ -202,7 +202,7 @@ 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());
+        String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null);
         if (checkGridName!=null){
             return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
         }
@@ -217,7 +217,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(),addGridFormDTO.getAgencyId());
+        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null);
         AddGridResultDTO addGridResultDTO = new AddGridResultDTO();
         addGridResultDTO.setGridId(gridId);
         return new Result<AddGridResultDTO>().ok(addGridResultDTO);
@@ -231,7 +231,7 @@ 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());
+        String checkGridName = baseDao.selectGridIdByGridName(editGridFormDTO.getGridName(),editGridFormDTO.getAgencyId(),editGridFormDTO.getGridId());
         if (checkGridName!=null){
             return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
         }

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

@@ -181,6 +181,9 @@
         WHERE
             grid_name = #{gridName}
             AND pid = #{agencyId}
+            <if test="gridId != null and gridId != '' ">
+                AND id != #{gridId}
+            </if>
             AND del_flag = 0
     </select>