Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -106,5 +106,7 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
                               @Param("areaCode")String areaCode,
                               @Param("operateUserId") String operateUserId);
 
-    int updateDeptAreaCode(@Param("agencyId")String agencyId, @Param("areaCode")String areaCode);
+    int updateDeptAreaCode(@Param("agencyId")String agencyId,
+                           @Param("areaCode")String areaCode,
+                           @Param("operateUserId") String operateUserId);
 }

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

@@ -356,5 +356,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
                               @Param("agencyId")String agencyId,
                               @Param("operateUserId") String operateUserId);
 
-    int updateGridAreaCode(@Param("agencyId")String agencyId, @Param("areaCode")String areaCode);
+    int updateGridAreaCode(@Param("agencyId")String agencyId, @Param("areaCode")String areaCode,@Param("operateUserId") String operateUserId);
 }

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

@@ -182,7 +182,7 @@ public class AgencyServiceImpl implements AgencyService {
                     //如果选择的是other,需要自定义一个编码
                     AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
                     addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
-                    addAreaCodeFormDTO.setParentAreaCode(formDTO.getAreaCode());
+                    addAreaCodeFormDTO.setParentAreaCode(parent.getAreaCode());
                     addAreaCodeFormDTO.setName(formDTO.getAgencyName());
                     Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
                     if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
@@ -192,8 +192,9 @@ public class AgencyServiceImpl implements AgencyService {
                     originalEntity.setParentAreaCode(parent.getAreaCode());
                 }
             }
-            customerGridDao.updateGridAreaCode(originalEntity.getId(),formDTO.getAreaCode());
-            customerDepartmentDao.updateDeptAreaCode(originalEntity.getId(),formDTO.getAreaCode());
+            //更新直属部门和直属网格的areaCode
+            customerGridDao.updateGridAreaCode(originalEntity.getId(),formDTO.getAreaCode(),formDTO.getUserId());
+            customerDepartmentDao.updateDeptAreaCode(originalEntity.getId(),formDTO.getAreaCode(),formDTO.getUserId());
         }
 
         //1:更新当前组织信息

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

@@ -100,6 +100,7 @@
     <update id="updateDeptAreaCode" parameterType="map">
          update customer_department
             SET AREA_CODE = #{areaCode},
+            UPDATED_BY=#{operateUserId},
             UPDATED_TIME = NOW()
             where del_flag='0'
             and agency_id=#{agencyId}

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

@@ -767,6 +767,7 @@
     <update id="updateGridAreaCode" parameterType="map">
         update customer_grid
         SET AREA_CODE = #{areaCode},
+        UPDATED_BY=#{operateUserId},
         UPDATED_TIME = NOW()
         where del_flag='0'
         and pid=#{agencyId}