Pārlūkot izejas kodu

feat: 积分包结算管理-导出可以手动指定参数

lixuesong 1 gadu atpakaļ
vecāks
revīzija
700fd693cd

+ 6 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -484,7 +484,9 @@ public class WmPayOffController {
 	@GetMapping("/exportPackageSettle")
 	public List<WmScorePackageSettleExcelModel> exportPackageSettle(WmScorePackageSettleInput input) {
 
-		input.setSendPackageDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
+		if (input.getSendPackageDeptId() == null) {
+			input.setSendPackageDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
+		}
 
 		return wmPayOffService.exportPackageSettle(input);
 	}
@@ -500,7 +502,9 @@ public class WmPayOffController {
 	@PostMapping("/exportPackageSettleByMAH")
 	public List<WmScorePackageSettleExcelModel> exportPackageSettleByMAH(WmScorePackageSettleInput input) {
 
-		input.setMahSettleDeptId(SecurityUtils.getUser().getDeptId());
+		if (input.getSendPackageDeptId() == null) {
+			input.setMahSettleDeptId(SecurityUtils.getUser().getDeptId());
+		}
 
 		return wmPayOffService.exportPackageSettleByMAH(input);
 	}