From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 9bb8712..6ec56d2 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -80,7 +80,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -165,7 +165,7 @@
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
//资格审查
- String body = InvestigateUtil.httpGet(user.getCardid());
+ String body = InvestigateUtil.httpGetOne(user.getCardid());
JSONObject jsonObject = new JSONObject(body);
String data = jsonObject.get("data").toString();
JSONObject jsonData = new JSONObject(data);
@@ -175,7 +175,7 @@
user.setExaminationType("0");
}else {
user.setExaminationType("1");
- user.setExaminationMx(res.getJSONObject(0).get("zdxsfzqkry").toString());
+ user.setExaminationMx(res.getJSONObject(0).get("zdrylbjh").toString());
}
return R.status(userService.submit(user));
}
--
Gitblit v1.9.3