From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 56e2f35..d47e10f 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
@@ -20,6 +20,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.view.RedirectView;
@@ -58,6 +59,9 @@
@Autowired
@Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
+
+ @Value("${spring.profiles.active}")
+ private String active;
// @Value("${wx_appid}")
// private String wxAppid;
@@ -125,14 +129,21 @@
// @IpWhitelist
@GetMapping("/SSOLogin")
public RedirectView SSOLogin(@RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String systype, String orgid, String userName, String token) {
- log.info("SSOLogin鐨勫叆鍙傦紝campusid锛歿}, deptId:{}, systype:{}, orgid:{}, userName:{}, token:{}",campusid,deptId,systype,orgid,userName,token);
+ log.info("SSOLogin鐨勫叆鍙傦紝campusid锛歿}, deptId:{}, systype:{}, orgid:{}, userName:{}, token:{}", campusid, deptId, systype, orgid, userName, token);
if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
}
String path = null;
if (StringUtils.isEmpty(systype)) path = sysConfigService.selectConfigByKey("sys.qddz");
else path = sysConfigService.selectConfigByKey("sys.qddz.yd");
- log.info("qddz鐨勬煡璇㈠�间负锛宲ath锛歿}",path);
+
+ if (active.equals("nhfy")){
+ //鍗楀崕闄勪竴鐨勶紝鍏堜笉璧板厤鐧伙紝鐩存帴璺冲埌鐧婚檰椤�
+ path = sysConfigService.selectConfigByKey("sys.qddz.yd");
+ log.info("銆怤HFYSSO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", path);
+ return buildRedirect(path);
+ }
+ log.info("qddz鐨勬煡璇㈠�间负锛宲ath锛歿}", path);
if (StringUtils.isEmpty(path)) {
throw new BaseException("璇烽厤缃墠绔湴鍧�");
--
Gitblit v1.9.3