Merge branch 'feat-20230710-mahpay' into temp-pre

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

@@ -2917,6 +2917,8 @@ public class WmScorePackageController {
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
 
+		queryWrapper.eq(WmScorePackage::getLocation, SubjectLocation.MAH_SETTLE);
+
 		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
 				.orderByDesc(WmScorePackage::getCreateTime));
 
@@ -3025,6 +3027,8 @@ public class WmScorePackageController {
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
 
+		queryWrapper.ne(WmScorePackage::getLocation, SubjectLocation.MAH_SETTLE);
+
 		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper
 				.orderByDesc(WmScorePackage::getCreateTime));