Commit ecd495e9 by 徐高华

离职继承欢迎语/删除判断是否单向好友

parent a39c8604
......@@ -487,6 +487,7 @@ public class WelcomeServiceImpl implements WelcomeService {
welcomeInfoQO.setDefaultWelcomeFlag(1);
List<TabWelcome> defaultWelcomeList = welcomeMapper.queryWelcomeList(welcomeInfoQO);
if (CollectionUtils.isEmpty(nonDefaultWelcomList)) {
logger.info("只有默认欢迎语");
return checkAndGetDefaultWelcome(defaultWelcomeList);
}
// 匹配部门组织架构
......@@ -523,7 +524,7 @@ public class WelcomeServiceImpl implements WelcomeService {
if (Objects.isNull(matchWelcome)) {
return checkAndGetDefaultWelcome(defaultWelcomeList);
}
logger.info("欢迎语已匹配");
logger.info("欢迎语已匹配={}",matchWelcome.getWelcomeId());
return matchWelcome;
}
......@@ -541,6 +542,7 @@ public class WelcomeServiceImpl implements WelcomeService {
logger.info("未配置默认欢迎语");
return null;
}
logger.info("使用默认欢迎语发送");
return convertWelcomeToBo(defaultWelcomeList.get(0));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment