Merge branch 'master_xgh_pendingid' into 'developer'

条数限制100

See merge request !334

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

@@ -91,12 +91,10 @@ public class WelcomeServiceImpl implements WelcomeService {
     @Autowired
     private WelcomeRelationService welcomeRelationService;
     @Autowired
-    private KeyDataService keyDataService;
-    @Autowired
     private HmLinkService linkService;
     @Autowired
     private HmQrcodeService qrcodeService;
-    private static final int WELCOME_LIMIT = 50;
+    private static final int WELCOME_LIMIT = 100;
     private static final int DEPARTMENT_NUM_LIMIT = 10000;
     private static final int STAFF_NUM_LIMIT = 2000;
     private static final int MEDIA_NUM_LIMIT = 9;
@@ -143,10 +141,10 @@ 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条";
+                return "普通欢迎语最多可创建"+WELCOME_LIMIT+"条";
             }
             if (HmWelcomeType.SPECIAL.getCode().equals(bo.getType())){
-                return "特殊欢迎语最多可创建50条";
+                return "特殊欢迎语最多可创建"+WELCOME_LIMIT+"条";
             }
             return "欢迎语条目超过限制";
         }