修复欢迎语更新逻辑

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -123,7 +123,7 @@ public class WelcomeServiceImpl implements WelcomeService {
 
     private TabWelcome addWelcome(SaveWelcomeBO bo) {
         if (bo.getDefaultWelcomeFlag() == 1 && this.existDefaultWelcome(bo.getWxEnterpriseId())) {
-            throw new RuntimeException("已存在全体成员欢迎语, 无法新增多条-新增逻辑");
+            throw new RuntimeException("已存在全体成员欢迎语, 无法新增多条全员欢迎语");
         }
         TabWelcome welcome = new TabWelcome();
         welcome.setWelcomeId(StringUtil.randomUUID());
@@ -136,15 +136,19 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcome.setUpdateTime(new Date());
         welcome.setOperatorId(bo.getOperatorId());
         welcome.setOperatorName(bo.getOperatorName());
-        // 通过外部新增的统一走非默认
         welcome.setDefaultWelcomeFlag(bo.getDefaultWelcomeFlag());
         welcomeMapper.insert(welcome);
         return welcome;
     }
 
     private TabWelcome updateWelcome(TabWelcome welcome, SaveWelcomeBO bo) {
-        if (bo.getDefaultWelcomeFlag() == 0 && this.existDefaultWelcome(bo.getWxEnterpriseId())) {
-            throw new RuntimeException("已存在全体成员欢迎语, 无法新增多条-更新逻辑");
+        // 校验是否非全员欢迎语更新为全员欢迎语
+        Integer defaultWelcomeFlag = welcome.getDefaultWelcomeFlag();
+        Boolean existDefaultWelcome = this.existDefaultWelcome(bo.getWxEnterpriseId());
+        // 不允许更新：当前更新的欢迎语非全员欢迎语并且存在全员欢迎语
+        boolean notAllowUpdate = defaultWelcomeFlag == 0 && existDefaultWelcome && bo.getDefaultWelcomeFlag() == 1;
+        if (notAllowUpdate) {
+            throw new RuntimeException("禁止更新, 已存在全员欢迎语, 当前欢迎语不允许更新为全员欢迎语");
         }
         welcome.setTitle(bo.getTitle());
         welcome.setWelcomeContent(bo.getWelcomeContent());
@@ -494,7 +498,7 @@ public class WelcomeServiceImpl implements WelcomeService {
             // 媒体类型 - 根据历史配置的加好友配置设置
             if (Objects.isNull(type) || FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode().equals(type)) {
                 media.setMediaType(WelcomeMediaTypeEnum.PARAM_PROGRAM.getCode());
-            } else if (Objects.nonNull(type) && FriendSettingTypeEnum.TEXT_AND_QRCODE.getCode().equals(type)) {
+            } else if (FriendSettingTypeEnum.TEXT_AND_QRCODE.getCode().equals(type)) {
                 media.setMediaType(WelcomeMediaTypeEnum.PARAM_QRCODE.getCode());
             }
             welcomeMediaMapper.insert(media);