From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
index eeb9416..117c81a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
@@ -16,11 +16,6 @@
import com.ruoyi.system.service.ISysUserService;
import com.smartor.domain.SSOTokenResponse;
import com.smartor.domain.SSOUserInfo;
-import com.smartor.domain.ServiceSubtask;
-import com.smartor.domain.VO.ServiceSubtaskVO;
-import com.smartor.domain.entity.ServiceSubtaskEntity;
-import com.smartor.service.IServiceSubtaskService;
-import com.smartor.service.impl.ServiceSubtaskServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +36,7 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
+import com.ruoyi.task.service.IServiceSubtaskService;
/**
* SSO鍗曠偣鐧诲綍鎺у埗鍣�
@@ -196,40 +192,29 @@
* ssoGoServiceSubtaskList
*/
@PostMapping("ssoGoServiceSubtaskList")
- public RedirectView ssoGoServiceSubtaskList(@RequestBody SysUser sysUserVo) {
+ public RedirectView ssoGoServiceSubtaskList(@RequestBody SSOUserInfo ssoUserInfo) {
// 閲嶅畾鍚戝湴鍧�瀵硅薄(閲嶅畾鍚戝湴鍧�
RedirectView redirectView = new RedirectView();
String path = sysConfigService.selectConfigByKey("sys.qddz");
- String userName = sysUserVo.getUserName();
- String orgid = sysUserVo.getOrgid();
- String campusid = sysUserVo.getCampusid();
- Long deptId = sysUserVo.getDeptId();
- List<String> deptCodes = sysUserVo.getDeptCodes();
- List<String> wardCodes = sysUserVo.getWardCodes();
+ String userName = ssoUserInfo.getUsername();
+ String orgid = ssoUserInfo.getOrgid();
+ String campusid = ssoUserInfo.getCampusid();
+ String searchCondition = "";
+ String deptCode = ssoUserInfo.getDeptCode();
+ String wardCode = ssoUserInfo.getWardCode();
try {
if (StringUtils.isEmpty(path)) {
throw new BaseException("璇烽厤缃墠绔湴鍧�");
}
- if(ObjectUtils.isEmpty(deptId)){
- SysDept sysDeptVo = new SysDept();
- sysDeptVo.setOrgid(orgid);
- sysDeptVo.setCampusid(campusid);
- if(CollectionUtils.isNotEmpty(deptCodes)){
- sysDeptVo.setDeptType("1");
- sysDeptVo.setDeptCodes(deptCodes);
- }else {
- sysDeptVo.setDeptType("2");
- sysDeptVo.setDeptCodes(wardCodes);
- }
- List<SysDept> sysDepts = sysDeptService.selectSysDeptList(sysDeptVo);
- if(CollectionUtils.isNotEmpty(sysDepts)){
- deptId = sysDepts.get(0).getDeptId();
- }
+ if(StringUtils.isNotEmpty(deptCode)){
+ searchCondition = "&followUpDeptCode=" + deptCode;
+ }else if(StringUtils.isNotEmpty(wardCode)){
+ searchCondition = "&followUpWardCode=" + deptCode;
}
String loginToken = loginService.loginByUserName(userName + "&" + orgid + "&null" + "&" + campusid);
String redirectUrl = path + "/loginSSO?token=" + loginToken +
"&orgid=" + orgid + "&campusid=" + campusid +
- "&deptId=" + deptId + "&orgname=null&ZuHuID=null&deptCode=null";
+ searchCondition + "&orgname=null&ZuHuID=null&deptCode=null";
log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
return buildRedirect(redirectUrl);
--
Gitblit v1.9.3