From 22a4f2b58fa1baa233e621d1406df456b516b4b1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 07 四月 2026 16:19:07 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
index 4c050f1..ebc461a 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
@@ -13,6 +13,7 @@
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
import com.fzzy.igds.app.v1.util.PhoneUtil;
import com.fzzy.igds.service.SysDeptService;
+import com.fzzy.igds.utils.Base64Util;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
@@ -58,6 +59,7 @@
private SysDeptService deptService;
@Autowired
private RedisCache redisUtil;
+
@Override
public String getInterfaceId() {
return PhoneConstant.API_PHONE_5001;
@@ -120,8 +122,8 @@
AsyncManager.me().execute(AsyncFactory.recordLogininfor(param.getUsername(), Constants.LOGIN_FAIL, MessageUtils.message("user.blocked")));
throw new UserBlockedException();
}
-
- passwordService.validate(user, param.getPassword());
+ String password = Base64Util.decodeBase64Password(param.getPassword());
+ passwordService.validate(user, password);
AsyncManager.me().execute(AsyncFactory.recordLogininfor(param.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
PUserDto phoneUserDto = new PUserDto();
@@ -138,8 +140,9 @@
authUser.setCname(user.getUserName());
authUser.setEmail(user.getEmail());
authUser.setMobile(user.getPhonenumber());
+ authUser.setUserType(user.getUserType());
//璁剧疆鐧诲綍鐢ㄦ埛鎵�灞炲垎搴撲俊鎭�
- SysDept dept = deptService.getCacheDept(user.getCompanyId(),user.getDeptId().toString());
+ SysDept dept = deptService.getCacheDept(user.getCompanyId(), user.getDeptId().toString());
phoneUserDto.setCompanyId(authUser.getCompanyId());
phoneUserDto.setDeptId(dept.getDeptId().toString());
--
Gitblit v1.9.3