Merge remote-tracking branch 'origin/cnbg-master' into cnbg-master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -167,7 +167,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
         if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), pkgType)
                 || StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), pkgType)) {
-            String limitValue = "30000";
+            String limitValue = "30000000";
             // 查询当前企业配置的积分限制
             List<WmTaskSubmissionRule> scoreLimitRuleList = taskSubmissionRuleService.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
                     .in(WmTaskSubmissionRule::getDeptId, CollUtil.newHashSet(deptId, 1))
@@ -212,7 +212,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
                 WmTaskSubmissionRule.SubmissionRule submissionRule = submissionRuleMap.containsKey(deptId) ? submissionRuleMap.get(deptId) : submissionRuleMap.get(1);
                 monthLimitValue = String.valueOf(submissionRule.getFrequency().get(0).get("quantity"));
             } else {
-                monthLimitValue = "300000";
+                monthLimitValue = "30000000";
             }
 
             LocalDate localDate = LocalDate.now();