From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
index 6e42f47..b13c6e5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
@@ -117,7 +117,26 @@
@ApiOperation(value = "修改")
@PutMapping("edit")
public Result<?> edit(@RequestBody @Valid RealNameAuthUpdateDto dto) {
- RealNameAuthRecord realNameAuthRecord= realNameAuthRecordService.getById(dto.getUuid());
+ RealNameAuthRecord realNameAuthRecord;
+ User user;
+ if (dto.getUuid() == null) {
+ if (dto.getUserCode() == null) {
+ return Result.failed("请输入UID");
+ }
+ realNameAuthRecord = new RealNameAuthRecord();
+ user = userService.findUserByUserCode(dto.getUserCode());
+ if (null == user) {
+ return Result.failed("用户不存在");
+ }
+ RealNameAuthRecord record = realNameAuthRecordService.getByUserId(user.getUserId());
+ if (null != record) {
+ realNameAuthRecordService.removeById(record.getUuid());
+ }
+ realNameAuthRecord.setUserId(user.getUserId());
+ } else {
+ realNameAuthRecord= realNameAuthRecordService.getById(dto.getUuid());
+ user= userService.getById(realNameAuthRecord.getUserId());
+ }
if(realNameAuthRecord==null) {
return Result.failed("记录ID不能为空");
}
@@ -149,7 +168,6 @@
}
- User user= userService.getById(realNameAuthRecord.getUserId());
Log log = new Log();
log.setCategory(Constants.LOG_CATEGORY_OPERATION);
log.setExtra(realNameAuthRecord.getIdNumber());
@@ -158,7 +176,7 @@
log.setUserId(realNameAuthRecord.getUserId());
log.setLog("修改用户[" + user.getUserName() + "]认证申请");
logService.save(log);
- realNameAuthRecordService.updateById(realNameAuthRecord);
+ realNameAuthRecordService.saveOrUpdate(realNameAuthRecord);
return Result.ok("修改成功");
}
--
Gitblit v1.9.3