From c88b888b1523dd8742eb9b853032188a15b05b9b Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Wed, 29 May 2024 19:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zdxt/app/task/UserInfoAndDeptTask.java     | 14 ++++++++++++++
 .../resources/mapper/system/DictTypeMapper.xml     |  1 +
 .../src/main/resources/static/ruoyi/js/common.js   |  2 +-
 .../main/resources/templates/system/user/user.html |  4 ++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java
index 007bab6d..90e5c77c 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java
@@ -1,14 +1,17 @@
 package com.zdxt.app.task;
 
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.project.system.dept.service.IDeptService;
+import com.zdxt.auth.project.system.dict.service.IDictDataService;
 import com.zdxt.auth.project.system.user.service.IUserService;
 import com.zdxt.code.service.ThirdLoginService;
 import com.zdxt.code.utils.HttpUtil;
 import com.zdxt.common.util.http.HttpUtils;
+import com.zdxt.domain.auth.DictData;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -28,6 +31,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -53,6 +57,10 @@ public class UserInfoAndDeptTask {
     @Autowired private UserApi userApi;
     @Autowired private IUserService userService;
     @Autowired private IDeptService deptService;
+    @Autowired
+    private IDictDataService iDictDataService;
+
+    public static Map<String,String> params = new HashMap<>();
 
     private static final Logger log = LoggerFactory.getLogger(UserInfoAndDeptTask.class);
 
@@ -65,6 +73,12 @@ public class UserInfoAndDeptTask {
      * 预警任务
      */
     public void userInfoAndDept(){
+        List<DictData> srz_item = iDictDataService.selectDictDataByType("srz_item");
+        Map<String,String> map = srz_item.stream().collect(Collectors.toMap(DictData::getDictLabel,DictData::getDictValue));
+
+        if(MapUtil.isNotEmpty(map)){
+            params = map;
+        }
         String token = "";
         String userInfo = "";
         String deptInfo = "";
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictTypeMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictTypeMapper.xml
index 50e08dd6..f1cc1ad9 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictTypeMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictTypeMapper.xml
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			</if>
 	    </where>
+	    order by create_time desc
 	</select>
 	
 	<select id="selectDictTypeAll" resultMap="DictTypeResult">
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/common.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/common.js
index a2c79b78..91c1d305 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/common.js
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/common.js
@@ -222,7 +222,7 @@ function createMenuItem(dataUrl, menuName) {
         $('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
         
         window.parent.$.modal.loading("数据加载中，请稍后...");
-        $('.mainContent iframe:visible', topWindow).load(function () {
+        $('.mainContent iframe:visible', topWindow).on("load",function () {
         	window.parent.$.modal.closeLoading();
         });
 
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html
index 813b847a..b047ee7f 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html
@@ -105,14 +105,14 @@
 		    if ($(this).width() < 769) {
 		        panehHidden = true;
 		    }
-		    /*$('body').layout(
+		    $('body').layout(
 		    		{
 						initClosed: panehHidden,
 						west__size: 185,
 						resizable:true,
 						resizerTip:"可调整大小"
 		    		}
-		    		);*/
+            );
 			// $('body').layout({closable: true, livePaneResizing: true});
 			// $('body').layout({
 			// 	// closable: false,