Merge remote-tracking branch 'origin/develop' into develop

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -630,14 +630,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 					+ CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType());
 			Integer maxNum = incomeMap.get(month + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType());
 			// 当明细的次数大于总次数，才可以新增统计
-			if (Common.isEmpty(maxNum) || nums >= maxNum) {
+			if (Common.isEmpty(maxNum) || ifNullToZero(nums) >= maxNum) {
 				return this.saveIncome(tIncomeDetail);
 			}
 		} else {
 			// 红冲判断：当本类型是最大值，才可以红冲
 			if (this.redDateJudge(tIncomeDetail, numMap)) return this.saveIncome(tIncomeDetail);
 		}
-		return false;
+		return true;
 	}