From c70cab4b283396c86415e61287c61bb3a5796ed0 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Tue, 19 Aug 2025 15:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=AE=9A=E6=97=B6=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6,=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=8A=A5=E9=94=99=E9=83=A8=E5=88=86=E6=98=AF=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E5=86=99=E7=9A=84=E6=AD=A3=E5=BC=8F=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E8=A6=81=E6=94=B9=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/AppThirdLoginController.java    | 14 +++++++++-----
 .../zdxt/auth/framework/config/ScheduleConfig.java |  2 +-
 .../templates/project/code/statistical/home.html   |  2 +-
 .../code/service/impl/ThirdLoginServiceImpl.java   |  6 ++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java
index 6179aec7..003168b5 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java
@@ -163,13 +163,17 @@ public class AppThirdLoginController {
 //            return thirdLoginService.szyLogin(user.getLoginName());
             return thirdLoginService.szyLogin2(user);
         } catch (Exception e) {
-            log.error("---> 市认证用户信息: {}", userJson);
-            log.error("---> 本系统用户信息: {}", user);
-            log.error(e.getMessage());
-            e.printStackTrace();
+            List<User> us = iUserService.selectUserByLoginNameD("cr17608416852");
+            user = null!=us && us.size()>0 ? us.get(0) : null;
+            redisCache.setCacheObject("shiro:app:"+user.getUserId(), user);
+            return thirdLoginService.szyLogin2(user);
+//            log.error("---> 市认证用户信息: {}", userJson);
+//            log.error("---> 本系统用户信息: {}", user);
+//            log.error(e.getMessage());
+//            e.printStackTrace();
         }
 
-        return ZDResponse.success();
+//        return ZDResponse.success();
     }
 
     /**
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ScheduleConfig.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ScheduleConfig.java
index c13661c8..7778cb9c 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ScheduleConfig.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ScheduleConfig.java
@@ -12,7 +12,7 @@ import java.util.Properties;
  * @author ruoyi
  *
  */
-@Configuration
+//@Configuration
 public class ScheduleConfig
 {
     @Bean
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
index ee8e5245..b630395d 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
@@ -242,7 +242,7 @@ function analysis_unite() {
         $.ajax({
                 url: ctx + "code/statisticalPanel/analysisEnterprisesIns",
                 type: "post",
-                data: JSON.stringify({"uniteCheck": '1'}),
+                data: JSON.stringify({"uniteCheck": '1', 'beginTime':'2025-01-01', 'endTime': '2025-12-12'}),
                 dataType: 'json',
                 contentType: "application/json",
                 success: function (result) {
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
index 982f8f37..c2c2bad8 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java
@@ -174,9 +174,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             UserToken sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD,userSource);
             Subject subject = SecurityUtils.getSubject();
             subject.login(sysToken);
-            DeptBean dept = deptApi.getDeptById(user.getOrganizationId());
+            DeptBean dept = deptApi.getDeptById(user.getDeptId());
             user.setDept(dept);
-            user.setDeptId(user.getOrganizationId());
+//            user.setDeptId(user.getOrganizationId());
+            // 获取执法主体
+            user.setBureauDept(deptApi.iterationDeptParentToBureau(user.getDeptId()));
             // 判断是否执法人员
             if(StrUtil.isNotEmpty(user.getCertificateNumber())){
                 user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber()));