Merge remote-tracking branch 'origin/temp-pre' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2458,7 +2458,6 @@ public class WmScorePackageController {
 				.eq("p.package_type2", packageType2)
 				.eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
 				.eq("p.send_package_dept_id", sendDeptId)
-				.isNull("p.mah_settle_dept_id")
 				.between(start != null && end != null, "p.create_time", start, end);
 
 		if (StrUtil.isNotBlank(scorePackageName)) {
@@ -2572,7 +2571,7 @@ public class WmScorePackageController {
 				.eq("p.package_type2", packageType2)
 				.eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
 				.eq("p.mah_settle_dept_id", sendDeptId)
-				.eq("p.mah_settle_step", UpmsType.MahSettleStep.BUSINESS.getType())
+				.in("p.mah_settle_step", UpmsType.MahSettleStep.BUSINESS.getType(), UpmsType.MahSettleStep.FINANCE.getType())
 				.between(start != null && end != null, "p.create_time", start, end);
 
 		if (StrUtil.isNotBlank(scorePackageName)) {