Merge branch 'feature-haoban-role' into 'developer'

欢迎语条数限制

See merge request !335

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

@@ -138,15 +138,17 @@ public class WelcomeServiceImpl implements WelcomeService {
 
     private String saveWelcomeCheck(SaveWelcomeBO bo) {
         // 校验欢迎语数量、适用部门、适用员工数量
-        long count = welcomeMapper.countByWxEnterpriseId(bo.getWxEnterpriseId(), bo.getType());
-        if (count >= WELCOME_LIMIT) {
-            if (HmWelcomeType.NORMAL.getCode().equals(bo.getType())){
-                return "普通欢迎语最多可创建"+WELCOME_LIMIT+"条";
-            }
-            if (HmWelcomeType.SPECIAL.getCode().equals(bo.getType())){
-                return "特殊欢迎语最多可创建"+WELCOME_LIMIT+"条";
+        if(null == bo.getWelcomeId()) {
+            long count = welcomeMapper.countByWxEnterpriseId(bo.getWxEnterpriseId(), bo.getType());
+            if (count >= WELCOME_LIMIT) {
+                if (HmWelcomeType.NORMAL.getCode().equals(bo.getType())){
+                    return "普通欢迎语最多可创建"+WELCOME_LIMIT+"条";
+                }
+                if (HmWelcomeType.SPECIAL.getCode().equals(bo.getType())){
+                      return "特殊欢迎语最多可创建"+WELCOME_LIMIT+"条";
+                }
+                return "欢迎语条目超过限制";
             }
-            return "欢迎语条目超过限制";
         }
         List<WelcomeSuitDepartmentBO> suitDepartmentList = bo.getSuitDepartmentAddList();
         if (CollectionUtils.isNotEmpty(suitDepartmentList)) {