From b715cb4b5b38a4649e2f67891b2b59043953e4f4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 10 May 2023 09:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommunityBuildingManagerController.java          |  6 +++---
 .../service/CommunityBuildingManagerService.java     | 12 +++++++++---
 .../impl/CommunityBuildingManagerServiceImpl.java    |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java
index 2597949a7d..379af23a48 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java
@@ -93,7 +93,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver {
 
     /**
      * 新增楼长/单元长
-     * todo: 同步到具体的楼栋
+     * 同步到具体的楼栋
      * @param dto
      * @return
      */
@@ -112,7 +112,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver {
 
     /**
      * 编辑楼长/单元长
-     * todo: 同步到具体的楼栋
+     * 同步到具体的楼栋
      * @param dto
      * @return
      */
@@ -130,7 +130,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver {
 
     /**
      * 批量删除楼长/单元长
-     * todo: 同时清空楼栋表里的信息
+     * 同时清空楼栋表里的信息
      * @param ids
      * @return
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java
index fc48ab538f..1e90100266 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java
@@ -40,7 +40,7 @@ public interface CommunityBuildingManagerService extends BaseService<CommunityBu
 
     /**
      * 新增楼长/单元长
-     * todo: 同步到具体的楼栋表
+     * 同步到具体的楼栋表
      *
      * @param dto
      * @return
@@ -49,7 +49,7 @@ public interface CommunityBuildingManagerService extends BaseService<CommunityBu
 
     /**
      * 编辑楼长/单元长
-     * todo: 同步到具体的楼栋
+     * 同步到具体的楼栋
      *
      * @param dto
      * @return
@@ -58,7 +58,7 @@ public interface CommunityBuildingManagerService extends BaseService<CommunityBu
 
     /**
      * 批量删除楼长/单元长
-     * todo: 同时清空楼栋表里的信息
+     * 同时清空楼栋表里的信息
      *
      * @param ids
      * @return
@@ -67,5 +67,11 @@ public interface CommunityBuildingManagerService extends BaseService<CommunityBu
 
     void execAsyncExcelImport(Path fileSavePath, String taskId);
 
+    /**
+     * 楼长单元长功能，只能社区级工作人员导入
+     *
+     * @param customerId
+     * @param userId
+     */
     void checkImportPermission(String customerId, String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java
index 63c0209d4f..36432c3ee3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java
@@ -154,7 +154,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl<Communi
         CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(addFormDto.getGridId());
         entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids()));
         insert(entity);
-        // 清空楼栋表的楼长4列信息
+        // 同步更新至ic_building
         LambdaUpdateWrapper<IcBuildingEntity> buildingUpdate = new LambdaUpdateWrapper<>();
         buildingUpdate.eq(IcBuildingEntity::getId, entity.getBuildingId())
                 .set(IcBuildingEntity::getBuildingLeaderName, entity.getName())
@@ -194,7 +194,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl<Communi
         CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(updateFormDto.getGridId());
         entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids()));
         updateById(entity);
-        // 清空楼栋表的楼长4列信息
+        // 同步更新至ic_building
         LambdaUpdateWrapper<IcBuildingEntity> buildingUpdate = new LambdaUpdateWrapper<>();
         buildingUpdate.eq(IcBuildingEntity::getId, updateFormDto.getBuildingId())
                 .set(IcBuildingEntity::getBuildingLeaderName, updateFormDto.getName())