From a94cdc7e37b3f480409a97fa350b7054bdd37e6b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 21 Aug 2023 18:11:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E9=80=9A=E5=AD=A6=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/config/params/QTXConfigParam.java  | 7 ++-----
 .../organization/service/impl/ConfigServiceImpl.java       | 6 ++++--
 src/com/engine/organization/web/ConfigController.java      | 5 ++++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/organization/entity/config/params/QTXConfigParam.java b/src/com/engine/organization/entity/config/params/QTXConfigParam.java
index 23498bc7..16823880 100644
--- a/src/com/engine/organization/entity/config/params/QTXConfigParam.java
+++ b/src/com/engine/organization/entity/config/params/QTXConfigParam.java
@@ -12,14 +12,11 @@ import lombok.*;
 @Data
 @Builder
 @AllArgsConstructor
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper=false)
 public class QTXConfigParam {
 
-    public QTXConfigParam() {
-        this.type = "1";
-        this.domainIndex = "0";
-        this.whole = "0";
-    }
+
 
     private String loginId;
 
diff --git a/src/com/engine/organization/service/impl/ConfigServiceImpl.java b/src/com/engine/organization/service/impl/ConfigServiceImpl.java
index d893755d..e8165f40 100644
--- a/src/com/engine/organization/service/impl/ConfigServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ConfigServiceImpl.java
@@ -38,17 +38,19 @@ public class ConfigServiceImpl extends Service implements ConfigService {
         String enable = bb.getPropValue("qtx_sso_login", "enable");
         String userAgent = qtx.getUserAgent();
         boolean termianal = MobileTerminalEnum.containsEnumValue(userAgent);
+
+
         if (Boolean.parseBoolean(enable)) {
             QTXConfigPO qtxConfig = getConfigMapper().selectConfigInfo();
             String domain = "0".equals(qtx.getDomainIndex()) ? qtxConfig.getUrl() : qtxConfig.getSecondUrl();
             String address = termianal ? qtxConfig.getMobileAddress() : qtxConfig.getPcAddress();
             String accessKey = URLEncoder.encode(getAccessKey(qtxConfig.getAppSecret()),"utf-8");
-            hkUrl = StrUtil.format("{}/{}?accessKey={}&type={}&username={}&whole={}",domain,address,accessKey,qtx.getType(),qtx.getLoginId(),qtx.getWhole());
+            hkUrl = StrUtil.format("{}{}?accessKey={}&type={}&username={}&whole={}&domainIndex={}",domain,address,accessKey,qtx.getType(),qtx.getLoginId(),qtx.getWhole(),qtx.getDomainIndex());
         }else {
             String accessKey = URLEncoder.encode(getAccessKey(bb.getPropValue("qtx_sso_login", "app_secret")),"utf-8");
             String domain = "0".equals(qtx.getDomainIndex()) ? bb.getPropValue("qtx_sso_login","url") : bb.getPropValue("qtx_sso_login","url1");
             String address = termianal ? bb.getPropValue("qtx_sso_login","h5address") : bb.getPropValue("qtx_sso_login","pcaddress");
-            hkUrl = StrUtil.format("{}/{}?accessKey={}&type={}&username={}&whole={}",domain,address,accessKey,qtx.getType(),qtx.getLoginId(),qtx.getWhole());
+            hkUrl = StrUtil.format("{}{}?accessKey={}&type={}&username={}&whole={}&domainIndex={}",domain,address,accessKey,qtx.getType(),qtx.getLoginId(),qtx.getWhole(),qtx.getDomainIndex());
         }
         return hkUrl;
     }
diff --git a/src/com/engine/organization/web/ConfigController.java b/src/com/engine/organization/web/ConfigController.java
index f357e57f..451a2c04 100644
--- a/src/com/engine/organization/web/ConfigController.java
+++ b/src/com/engine/organization/web/ConfigController.java
@@ -36,7 +36,10 @@ public class ConfigController {
     public void ssoLogin(@Context HttpServletRequest request, @Context HttpServletResponse response,
                                @QueryParam("type") String type,@QueryParam("domainIndex") String domainIndex,@QueryParam("whole") String whole) throws IOException {
         User user = HrmUserVarify.getUser(request, response);
-        QTXConfigParam qtxConfigParam = QTXConfigParam.builder().loginId(user.getLoginid()).type(type).domainIndex(domainIndex).whole(whole)
+        QTXConfigParam qtxConfigParam = QTXConfigParam.builder().loginId(user.getLoginid())
+                .type(type == null ? "1" : type)
+                .domainIndex(domainIndex == null ? "0" : domainIndex)
+                .whole(whole == null ? "0" : whole)
                 .userAgent(request.getHeader("user-agent")).build();
         String url = getConfigService(user).ssoLogin(qtxConfigParam);
         response.sendRedirect(url);