From 7722aa86f1a0e2aacbf2fd17203789619e1c64e3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 19:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index 9f1359a..7972f2d 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -175,10 +175,12 @@
String account=zc.getUsername();
if (type.equals("1")) {
iUserService.updateAcc(stype,account);
+ zcService.saveOrUpdate(zc);
} else {
iUserService.delete(account);
+ zcService.deleteZc(account);
}
- return R.status(zcService.saveOrUpdate(zc));
+ return R.success("成功");
}
@@ -247,7 +249,8 @@
@GetMapping("/inspect")
public R inspect(String username) {
Integer userCount = iUserService.selectCount(username);
- if (userCount > 0) {
+ Integer integer = zcService.selecyZcCount(username);
+ if (userCount > 0 || integer > 0) {
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户{}已存在!", username));
}
return R.success("当前用户不存在!");
--
Gitblit v1.9.3