From 3b5b47c0a839c2245d045f93cff916db701dcb5d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 14 二月 2025 13:31:04 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java |    5 ++++-
 1 files changed, 4 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 658b4f5..c784c42 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
@@ -123,17 +123,20 @@
         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();
         TTenantResp tTenantResp = new TTenantResp();
         BeanUtils.copyProperties(tenant, tTenantResp);
         loginUserApplet.setUser(tTenantResp);
-        loginUserApplet.setUserId(Long.valueOf(tenant.getId()));
+        loginUserApplet.setUserId(tenant.getId());
         Map<String, Object> tokenInfos = new HashMap<>();
         tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
         tokenInfos.put("info",loginUserApplet);

--
Gitblit v1.7.1