From 065f5c6e6ef3fb461a7cee9cb5b53672727c2c4e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Dec 2023 11:08:34 +0800
Subject: [PATCH] 考勤修改，用户查询详情接口
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 51ee35e..e557af3 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -77,6 +77,7 @@
import org.springblade.modules.system.excel.*;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
@@ -261,6 +262,22 @@
//返回
return R.success("成功");
+ }
+
+ /**
+ * 微信注册
+ * @param user
+ * @return
+ */
+ @PostMapping("/wxRegister")
+ public R wxRegister(User user){
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+
+ Boolean result = userService.wxRegister(user);
+ return R.status(result);
}
/**
@@ -1368,4 +1385,13 @@
public R dataHandler() {
return R.data(userService.dataHandler());
}
+
+
+ //获取用户表和用户详情表的信息
+ @GetMapping("/getUserInfoDetail")
+ public R getUserInfoDetail(String id){
+ UserInfoDetail userInfoDetail = userService.getUserInfoDetail(id);
+ return R.data(userInfoDetail);
+ }
+
}
--
Gitblit v1.9.3