From 358e4f19e130045ce58c2313435baec2a3f11b61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 25 二月 2025 10:47:58 +0800
Subject: [PATCH] 审批流
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 7f39fab..3f0f789 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.TTenantResp;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
@@ -29,6 +30,7 @@
import com.ruoyi.system.utils.wx.tools.WxUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -121,14 +123,21 @@
if (tenant==null){
// appUser.setTenantAttributes();
// appUser.setTenantType();
+ tenant = new TTenant();
tenant.setPhone(appletUserDecodeData.getPhoneNumber());
tenant.setAccount(appletUserDecodeData.getPhoneNumber());
tenant.setPassword(SecurityUtils.encryptPassword(appletUserDecodeData.getPhoneNumber().substring(5)));
tenant.setOpenId(appletUserDecodeData.getOpenId());
+ // 手机号中间四位替换为*
+ tenant.setResidentName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
tTenantService.save(tenant);
}
LoginUserApplet loginUserApplet = new LoginUserApplet();
- loginUserApplet.setUserId(Long.valueOf(tenant.getId()));
+ TTenantResp tTenantResp = new TTenantResp();
+ BeanUtils.copyProperties(tenant, tTenantResp);
+ tTenantResp.setResidentName(appletUserDecodeData.getPhoneNumber());
+ loginUserApplet.setUser(tTenantResp);
+ loginUserApplet.setUserId(tenant.getId());
Map<String, Object> tokenInfos = new HashMap<>();
tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
tokenInfos.put("info",loginUserApplet);
--
Gitblit v1.7.1