From 97f4c8f1aeea0b973d302d25bbf60c82dddf9a8d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 26 Aug 2021 09:56:50 +0800
Subject: [PATCH] 1.备案

---
 src/main/java/org/springblade/modules/revoke/controller/RevokeController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index 2dca31c..e1fc016 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -93,14 +93,14 @@
 	@ApiOperation(value = "新增", notes = "传入revoke")
 	public R save(@Valid @RequestBody Revoke revoke) {
 		String cardid = revoke.getCardid();
-		Map map = revokeService.selectIn(cardid);
+		String type = revoke.getPtype();
+		Map map = revokeService.selectIn(cardid,type);
 		if (map != null) {
 			String id = map.get("id").toString();
 			revokeService.removeByIds(Func.toLongList(id));
 		}
 		revoke.setStorage("1");
 		revoke.setType("2");
-		revoke.setPtype("6");
 		revoke.setPermitime(new Date());
 		revokeService.save(revoke);
 		String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getEstablishtime());
@@ -131,14 +131,14 @@
 	@ApiOperation(value = "新增", notes = "传入revoke")
 	public R revokesave(@Valid @RequestBody Revoke revoke) {
 		String cardid = revoke.getCardid();
-		Map map = revokeService.selectIn(cardid);
+		String type = revoke.getPtype();
+		Map map = revokeService.selectIn(cardid,type);
 		if (map != null) {
 			revoke.setStorage("0");
 			revokeService.updateById(revoke);
 		} else {
 			revoke.setStorage("0");
 			revoke.setType("2");
-			revoke.setPtype("6");
 			revoke.setPermitime(new Date());
 			revokeService.save(revoke);
 		}
@@ -177,8 +177,8 @@
 	}
 
 	@PostMapping("/selectIn")
-	public R selectIn(String cardid) {
-		Map map = revokeService.selectIn(cardid);
+	public R selectIn(String cardid,String type) {
+		Map map = revokeService.selectIn(cardid,type);
 		return R.data(map);
 	}
 

--
Gitblit v1.9.3