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