From 5d5213f18fc845151e9dcbe51f5dac272c93761d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 18 Aug 2021 19:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 9024a14..bc49913 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -133,11 +133,15 @@
String cardid = permit.getCardid();
Map map = permitService.selectIn(cardid);
if (map!=null){
+ permit.setStorage("0");
permitService.updateById(permit);
}
- permit.setStorage("0");
- permit.setPermitime(new Date());
- return R.status(permitService.save(permit));
+ else {
+ permit.setStorage("0");
+ permit.setPermitime(new Date());
+ permitService.save(permit);
+ }
+ return R.success("暂存成功");
}
--
Gitblit v1.9.3