Commit a39c8604 by 徐高华

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

parent 14b37c07
...@@ -227,6 +227,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -227,6 +227,7 @@ public class WelcomeServiceImpl implements WelcomeService {
welcome.setDefaultWelcomeFlag(bo.getDefaultWelcomeFlag()); welcome.setDefaultWelcomeFlag(bo.getDefaultWelcomeFlag());
welcome.setModifierId(bo.getModifierId()); welcome.setModifierId(bo.getModifierId());
welcome.setModifierName(bo.getModifierName()); welcome.setModifierName(bo.getModifierName());
welcome.setScene(bo.getScene());
welcomeMapper.updateByPrimaryKeySelective(welcome); welcomeMapper.updateByPrimaryKeySelective(welcome);
return welcome; return welcome;
} }
...@@ -475,7 +476,11 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -475,7 +476,11 @@ public class WelcomeServiceImpl implements WelcomeService {
// 查询非默认欢迎语 // 查询非默认欢迎语
welcomeInfoQO.setDefaultWelcomeFlag(0); welcomeInfoQO.setDefaultWelcomeFlag(0);
logger.info("发送场景={}",welcomeScene); logger.info("发送场景={}",welcomeScene);
welcomeInfoQO.setSceneType(welcomeScene); if(welcomeScene==202) {
welcomeInfoQO.setSceneType(2);
}else {
welcomeInfoQO.setSceneType(1);
}
List<TabWelcome> nonDefaultWelcomList = welcomeMapper.queryWelcomeList(welcomeInfoQO); List<TabWelcome> nonDefaultWelcomList = welcomeMapper.queryWelcomeList(welcomeInfoQO);
// 查询默认欢迎语 // 查询默认欢迎语
welcomeInfoQO.setSceneType(0); welcomeInfoQO.setSceneType(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