Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -86,7 +86,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
 
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
-        tMonitoringRetrievalPlan.setCheckSub(true);
+       // tMonitoringRetrievalPlan.setCheckSub(true);
         List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE.longValue(), SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgExtendServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.dto.SysOrgExtendDto;
 import com.xunmei.system.mapper.SysOrgMapper;
@@ -120,10 +121,33 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
 //        sysOrgExtend.setParentGuid(sysOrg.getParentGuid());
         SysOrg org = new SysOrg();
         BeanUtils.copyProperties(sysOrgExtend,org);
-        orgService.saveOrUpdateOrg(org);
+        boolean isOk = false;
+        if (org.getId() != null) {
+            if (StringUtils.isEmpty(org.getManagerPhone())) {
+                org.setManagerPhone(org.getPhone());
+            }
+            isOk = orgService.updateById(org);
+        } else {
+            SysOrg sysOrg = orgMapper.selectById(org.getParentId());
+            org.setParentGuid(sysOrg.getGuid());
+            org.setDeleted(0);
+            long id = IdWorker.getId();
+            org.setId(id);
+            org.setPath(sysOrg.getPath() + id + "-");
+            if (StringUtils.isEmpty(org.getManagerPhone())) {
+                org.setManagerPhone(org.getPhone());
+            }
+            isOk = orgService.save(org);
+        }
+        /*
+         * 重置缓存
+         */
+        orgService.clearOrgCache();
+        orgService.loadingOrgCache();
+//        orgService.saveOrUpdateOrg(org);
 
         SysOrgExtend extend = new SysOrgExtend();
-        extend.setOrgId(sysOrgExtend.getId());
+        extend.setOrgId(org.getId());
         extend.setCreateTime(DateUtils.getNowDate());
         extend.setDetachedLobbyEquipment(sysOrgExtend.getDetachedLobbyEquipment());
         extend.setDetachedWallPenetratingEquipment(sysOrgExtend.getDetachedWallPenetratingEquipment());