xuhy
昨天 4955cdc73d9beb5733aa2c0a578c14798394fa61
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -131,16 +131,15 @@
                .and(e->e.eq(TSysAppUser::getOpenId, appletUserDecodeData.getOpenId()).or()
                        .eq(TSysAppUser::getPhone, appletUserDecodeData.getPhoneNumber())));
        if (sysAppUser==null){
//            appUser.setTenantAttributes();
//            appUser.setTenantType();
            sysAppUser = new TSysAppUser();
            sysAppUser.setPhone(appletUserDecodeData.getPhoneNumber());
//            sysAppUser.setAccount(appletUserDecodeData.getPhoneNumber());
//            sysAppUser.setPassword(SecurityUtils.encryptPassword(appletUserDecodeData.getPhoneNumber().substring(5)));
            sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
            // 手机号中间四位替换为*
            sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
            sysAppUserService.save(sysAppUser);
        }else {
            // 手机号相同但openId为空的情况
            sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
        }
        LoginUserApplet loginUserApplet = new LoginUserApplet();
        TSysUserResp sysUserResp = new TSysUserResp();