gaoxiong 1 an în urmă
părinte
comite
b34a65a8b1

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -165,7 +165,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
             for (CoreIntroduceLetterVo record : records) {
                 List<Long> orgIds = toOrgList.stream().filter(toOrg -> toOrg.getLetterId().equals(record.getId())).map(CoreIntroduceLetterToOrg::getOrgId).collect(Collectors.toList());
                 String orgNames = orgIds.stream().map(orgId -> {
-                    final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get();
+                    final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().orElse(null);
                     if (ObjectUtil.isNotEmpty(sysOrg)) {
                         if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || (ObjectUtil.isNotNull(sysOrg.getType()) && sysOrg.getType() < 4) || sysOrg.getShortName().endsWith("地区行社")) {
                             return sysOrg.getShortName();

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

@@ -144,14 +144,6 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
             }
             isOk = orgService.save(org);
         }
-        /*
-         * 重置缓存
-         */
-        RedisUtils.deleteObject(CacheConstants.ORG_CACHE_LIST_KEY);
-        List<SysOrgVO> sysOrgVOS = orgMapper.selectSysOrgVOList();
-        RedisUtils.setCacheList(CacheConstants.ORG_CACHE_LIST_KEY, sysOrgVOS);
-//        orgService.clearOrgCache();
-//        orgService.loadingOrgCache();
 
         //处理物防建设数据
         physicalDefenseConstructionMapper.delete(new LambdaQueryWrapper<SysPhysicalDefenseConstruction>().eq(SysPhysicalDefenseConstruction::getOrgId,org.getId()));