Merge branch 'feature-0808' into developer

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

@@ -142,6 +142,14 @@ public class WelcomeServiceImpl implements WelcomeService {
         // 校验欢迎语数量、适用部门、适用员工数量
         long count = welcomeMapper.countByWxEnterpriseId(bo.getWxEnterpriseId(), bo.getType());
         if (count >= WELCOME_LIMIT) {
+            if (HmWelcomeType.NORMAL.getCode().equals(bo.getType())){
+                return "数量已达上限," +
+                        "普通欢迎语最多可创建50条";
+            }
+            if (HmWelcomeType.SPECIAL.getCode().equals(bo.getType())){
+                return "数量已达上限," +
+                        "特殊欢迎语最多可创建50条";
+            }
             return "欢迎语条目超过限制";
         }
         List<WelcomeSuitDepartmentBO> suitDepartmentList = bo.getSuitDepartmentAddList();

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

@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
+import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
 import com.gic.haoban.manage.service.pojo.bo.welcome.FriendSettingDetailBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.SaveFriendSettingBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.SaveWelcomeBO;
@@ -67,8 +68,13 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         saveWelcomeBO.setSuitDepartmentAddList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentBO.class, qdto.getSuitDepartmentAddList()));
         // 使用部门删除列表
         saveWelcomeBO.setSuitDepartmentDeleteList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentBO.class, qdto.getSuitDepartmentDeleteList()));
-        Boolean saveWelcome = welcomeService.saveWelcome(saveWelcomeBO);
-        return ServiceResponse.success(saveWelcome);
+        try {
+            Boolean saveWelcome = welcomeService.saveWelcome(saveWelcomeBO);
+            return ServiceResponse.success(saveWelcome);
+        }catch (RuntimeException ex){
+            String message = ex.getMessage();
+            return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), message);
+        }
     }
 
     @Override

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -139,6 +139,7 @@ public class WelcomeController extends WebBaseController {
         ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
         if (!response.isSuccess()){
             GicLogRecordEvaluationContext.noWriteLog();
+            return RestResponse.failure(response.getCode(), response.getMessage());
         }
         return RestResponse.successResult(response.getResult());
     }