2022年12月8 18:13

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -216,13 +216,16 @@ public class AuditProecessController extends BladeController {
 	@GetMapping("findAuditProcessList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查看审核记录", notes = " ")
-	public R findAuditProcessList(@ApiParam(value = "申请表主键", required = true) @RequestParam Long id, @ApiParam(value = "批次号", required = false) @RequestParam Long batchNo) {
+	public R findAuditProcessList(@ApiParam(value = "申请表主键", required = true) @RequestParam Long id,
+								  @ApiParam(value = "批次号", required = false) @RequestParam Long batchNo,
+								  @ApiParam(value = "第几次提交", required = false) @RequestParam Integer times) {
 		//查询最大批次号
 		LambdaQueryWrapper<AuditProecess> countMaxWrapper = new LambdaQueryWrapper<>();
 		countMaxWrapper
 			.eq(AuditProecess::getSrcBillId, id)
 			.eq(AuditProecess::getIsDelete, 0)
-			.eq(AuditProecess::getTenantId, AuthUtil.getTenantId());
+			.eq(AuditProecess::getTenantId, AuthUtil.getTenantId())
+			.eq(ObjectUtil.isNotEmpty(times), AuditProecess::getTimes, times);
 		List<AuditProecess> proecessList = auditProecessService.list(countMaxWrapper);
 		if (CollectionUtils.isEmpty(proecessList)) {
 			return R.data(Collections.EMPTY_LIST);

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -90,8 +90,10 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 	@Override
 	public R saveSalesPolicy(SalesPolicy salesPolicy) {
 		//审批中停用撤销审批
-		if (salesPolicy.getStatus() == 1 && salesPolicy.getAuditStatus() == 3){
-			this.repealCancel(salesPolicy);
+		if (ObjectUtil.isNotEmpty(salesPolicy.getStatus()) && ObjectUtil.isNotEmpty(salesPolicy.getAuditStatus())){
+			if (salesPolicy.getStatus() == 1 && salesPolicy.getAuditStatus() == 3){
+				this.repealCancel(salesPolicy);
+			}
 		}
 		if (salesPolicy.getId() == null) {
 			salesPolicy.setTenantId(SecureUtil.getTenantId());