From 9eec4efbeefb83b2e1b7e363899b5fdc17eda501 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 22 四月 2026 17:11:19 +0800
Subject: [PATCH] 修改捐献上报基础ID未保存
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 5cd5425..a9c38e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -104,17 +104,14 @@
// dingTalkService.deptidList(1L, 1);
Map<String, Object> userIdMap = null;
if (StringUtils.isNotEmpty(loginBody.getAuthCode())) {
- Map<String, Object> map = dingTalkService.noLogin(loginBody.getAuthCode());
- userIdMap = (Map<String, Object>) map.get("result");
+ userIdMap = dingTalkService.noLogin(loginBody.getAuthCode());
}
log.info("userIdMap鐨勫�间负锛歿}", userIdMap);
- //鑾峰彇褰撳墠鏃ユ湡
-
// 鐢熸垚浠ょ墝
String token = null;
if (!ObjectUtils.isEmpty(userIdMap)) {
- token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid(), userIdMap.get("userid").toString());
+ token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid(), userIdMap.get("mobile").toString());
} else if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
//閫氱敤瀵嗙爜锛欻rs#褰撳墠骞存湀鏃�*
token = loginService.getTokenWN(loginBody.getUsername());
@@ -142,7 +139,7 @@
//鑾峰彇鍗忚皟鍛�
BaseOrganization baseOrganization = new BaseOrganization();
- baseOrganization.setReporterNo(user.getUserName());
+ baseOrganization.setId(user.getOrgId());
baseOrganization.setDelFlag(0);
List<BaseOrganization> baseOrganizations = baseOrganizationService.queryList(baseOrganization);
if (CollectionUtils.isNotEmpty(baseOrganizations) && baseOrganizations.size() > 0) {
--
Gitblit v1.9.3