Переглянути джерело

解决 介绍信管理 选择没有机构类型的机构会报错

zhulu 1 рік тому
батько
коміт
a6348cea54

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

@@ -167,7 +167,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
                 String orgNames = orgIds.stream().map(orgId -> {
                     final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get();
                     if (ObjectUtil.isNotEmpty(sysOrg)) {
-                        if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || sysOrg.getType() < 4 || sysOrg.getShortName().endsWith("地区行社")) {
+                        if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || (ObjectUtil.isNotNull(sysOrg.getType()) && sysOrg.getType() < 4) || sysOrg.getShortName().endsWith("地区行社")) {
                             return sysOrg.getShortName();
                         }
                         return sysOrg.getAffiliatedBank() + "-" + sysOrg.getShortName();