Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/DepartmentServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class DepartmentServiceImpl implements DepartmentService {
@@ -76,17 +77,18 @@ public class DepartmentServiceImpl implements DepartmentService {
         if (department.getTempFlag() == null) {
             department.setTempFlag(0);
         }
-
         mapper.insert(tab);
-
-        syncWelcomeSuitDepartment(tab.getParentDepartmentId(), tab.getDepartmentId(), tab.getDepartmentName(), tab.getWxEnterpriseId());
-
+        try {
+            syncWelcomeSuitAddDepartment(tab.getParentDepartmentId(), tab.getDepartmentId(), tab.getDepartmentName(), tab.getWxEnterpriseId());
+        } catch (Exception e) {
+            logger.error("同步部门-新增欢迎语适用部门信息异常", e);
+        }
         return tab.getDepartmentId();
 
     }
 
-    private void syncWelcomeSuitDepartment(String parentDepartmentId, String currentDepartmentId,
-                                           String currentDepartmentName, String wxEnterpriseId) {
+    private void syncWelcomeSuitAddDepartment(String parentDepartmentId, String currentDepartmentId,
+                                              String currentDepartmentName, String wxEnterpriseId) {
         logger.info("同步欢迎语适用部门, parentDepartmentId:{}, currentDepartmentId:{}, wxEnterpriseId:{}",
                 parentDepartmentId, currentDepartmentId, wxEnterpriseId);
         if (StringUtils.isEmpty(parentDepartmentId)) {
@@ -104,7 +106,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         }
         logger.info("父部门匹配到的欢迎语适用部门, welcomeSuitRangList:{}", JSON.toJSONString(welcomeSuitRangList));
         // 为每一个父部门匹配到的欢迎语, 添加当前部门适用范围
-        welcomeSuitRangList.forEach(one ->  {
+        welcomeSuitRangList.forEach(one -> {
             TabHaobanWelcomeSuitRang entity = new TabHaobanWelcomeSuitRang();
             entity.setWelcomeSuitRangId(UniqueIdUtils.uniqueLong());
             entity.setWxEnterpriseId(wxEnterpriseId);
@@ -130,18 +132,68 @@ public class DepartmentServiceImpl implements DepartmentService {
         TabHaobanDepartment tab = EntityUtil.changeEntityByJSON(TabHaobanDepartment.class, department);
         tab.setUpdateTime(now);
         mapper.updateByPrimaryKeySelective(tab);
+        try {
+            syncWelcomeSuitEditDepartment(tab);
+        } catch (Exception e) {
+            logger.error("同步部门-修改欢迎语适用部门信息异常", e);
+        }
+    }
 
+    private void syncWelcomeSuitEditDepartment(TabHaobanDepartment tab) {
+        if (StringUtils.isEmpty(tab.getWxEnterpriseId())) {
+            return;
+        }
+        // 列举部门被关联的欢迎语
+        TabHaobanWelcomeSuitRang query = new TabHaobanWelcomeSuitRang();
+        query.setWxEnterpriseId(tab.getWxEnterpriseId());
+        query.setSuitDepartmentId(tab.getDepartmentId());
+        query.setDeleteFlag(0);
+        List<TabHaobanWelcomeSuitRang> welcomeSuitRangList = welcomeSuitRangMapper.queryAll(query);
+        if (CollectionUtils.isEmpty(welcomeSuitRangList)) {
+            logger.info("部门查询为空");
+            return;
+        }
+        // 更新名称
+        welcomeSuitRangList.forEach(one -> {
+            one.setUpdateTime(new Date());
+            one.setSuitDepartmentName(tab.getDepartmentName());
+            welcomeSuitRangMapper.update(one);
+        });
     }
 
     @Override
     public void del(String departmentId) {
         TabHaobanDepartment tab = mapper.selectByPrimaryKey(departmentId);
-        if (tab != null) {
-            tab.setStatusFlag(0);
-            tab.setUpdateTime(new Date());
+        if (Objects.isNull(tab)) {
+            return;
         }
+        tab.setStatusFlag(0);
+        tab.setUpdateTime(new Date());
         mapper.updateByPrimaryKeySelective(tab);
+        try {
+            syncWelcomeSuitDeleteDepartment(departmentId, tab.getWxEnterpriseId());
+        } catch (Exception e) {
+            logger.error("同步部门-删除欢迎语适用部门信息异常", e);
+        }
+    }
 
+    private void syncWelcomeSuitDeleteDepartment(String departmentId, String wxEnterperiseId) {
+        // 列举部门被关联的欢迎语
+        TabHaobanWelcomeSuitRang query = new TabHaobanWelcomeSuitRang();
+        query.setWxEnterpriseId(wxEnterperiseId);
+        query.setSuitDepartmentId(departmentId);
+        query.setDeleteFlag(0);
+        List<TabHaobanWelcomeSuitRang> welcomeSuitRangList = welcomeSuitRangMapper.queryAll(query);
+        if (CollectionUtils.isEmpty(welcomeSuitRangList)) {
+            logger.info("部门查询为空");
+            return;
+        }
+        // 删除
+        welcomeSuitRangList.forEach(one -> {
+            one.setUpdateTime(new Date());
+            one.setDeleteFlag(1);
+            welcomeSuitRangMapper.update(one);
+        });
     }
 
     @Override