Merge branch '20250408-wyp-contentPlatform' of Server/growth-manager into master

api-module/src/main/java/com/tzld/piaoquan/api/common/enums/ExceptionEnum.java

@@ -21,6 +21,7 @@ public enum ExceptionEnum {
     LOGIN_PASSWORD_WRONG(1003, "登录失败-账号或密码错误"),
     TEL_NUM_EXISTS_WRONG(1004, "联系人号码已存在"),
     CHANNEL_EXISTS_WRONG(1005, "渠道已存在"),
+    CHANNEL_NULL_WRONG(1006, "渠道不能为空"),
     ACCOUNT_BANNED(1007, "账号被封禁"),
     USER_NOT_EXIST(1008, "user not exist"),
     SmsCodeExpired(1010, "短信验证码无效"),

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformAccountServiceImpl.java

@@ -181,6 +181,9 @@ public class ContentPlatformAccountServiceImpl implements ContentPlatformAccount
         if (CollectionUtils.isNotEmpty(channelExistsList)) {
             throw new CommonException(ExceptionEnum.CHANNEL_EXISTS_WRONG);
         }
+        if (Objects.isNull(param.getChannel())) {
+            throw new CommonException(ExceptionEnum.CHANNEL_EXISTS_WRONG);
+        }
         Long now = System.currentTimeMillis();
         ContentPlatformAccount account = new ContentPlatformAccount();
         account.setName(param.getName());

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformCooperateAccountServiceImpl.java

@@ -141,7 +141,7 @@ public class ContentPlatformCooperateAccountServiceImpl implements ContentPlatfo
 
     @Override
     public List<String> getGzhContentType() {
-        return Arrays.asList("泛历史", "泛兴趣");
+        return Arrays.asList("泛历史", "泛生活");
     }
 
     @Override