漏洞修复

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -118,7 +118,6 @@ public class IdCardCryptoUtil {
                 .form("userId", userId)
                 .form("userName", userName);
         request.contentType("application/x-www-form-urlencoded");
-        System.out.println(request.execute().body());
         JSONObject jsonObject = JSONObject.parseObject(request.execute().body());
         String data = jsonObject.getString("data");
         return data;

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java

@@ -56,7 +56,6 @@ public class AppEnforcementCheckStatisticsController extends BaseController {
         String month1=StringUtils.join(month,",");
         enforcementCheckStatistics.setYear(year);
         enforcementCheckStatistics.setMonth(month1);
-        System.out.println(enforcementCheckStatistics);
         //查出区下所有区的id
         List<EnforcementCheckStatistics> areaAllList = enforcementCheckStatisticsService.selectAllAreaList();
         //存放以区id为键，该id下的所有记录为值

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -136,7 +136,7 @@ public class AppThirdLoginController {
     public ZDResponse szyptLogin(@PathVariable String code){
 
         System.out.println("====================== code ======================");
-        System.out.println(code);
+        log.info("深政易用户登录code：{}",code);
         System.out.println("====================== code ======================");
 
         String accessTokenJson = "";
@@ -149,9 +149,7 @@ public class AppThirdLoginController {
 
             // 获取 用户Id
             userJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+token+"&code="+code, null);
-            System.out.println("====================== userInfo ======================");
-            System.out.println(userJson);
-            System.out.println("====================== userInfo ======================");
+
             JSONObject userOjb = JSONObject.parseObject(userJson);
             String userId = userOjb.getString("UserId");
 
@@ -292,7 +290,7 @@ public class AppThirdLoginController {
             //锁不存在：
             //1.加锁限制用户登录并发情况
             if(!jedisUtil.exists(redisLock)){
-                jedisUtil.isLock(redisLock,100);
+                jedisUtil.isLock(redisLock,1000);
                 log.info("redis用户登录加锁,加锁用户：{}",userInfo.toJSONString());
                 //添加深i企用户
                 Long userId = thirdLoginService.addSiqUser(userInfo);
@@ -303,12 +301,10 @@ public class AppThirdLoginController {
                 log.info("================= siqLogin addSiqUser -> userId =================");
                 //添加深i企用户关联企业信息
                 thirdLoginService.addSiqUserCompany(userInfo);
+                return thirdLoginService.siqLogin(userInfo);
             }else{
                 log.info("用户正在登录中，用户信息：{}",userInfo.toJSONString());
             }
-
-            return thirdLoginService.siqLogin(userInfo);
-
         }catch (Exception e){
             e.printStackTrace();
         }finally {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@@ -32,7 +32,7 @@ public class CorsFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         //配置可信域名
         String[]  authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301",
-                "http://localhost:3301"};
+                "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85"};
         String authost = "";
         HttpServletRequest httprequest = (HttpServletRequest) request;
         String origin = httprequest.getHeader("Origin");

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/service/LoginService.java

@@ -41,11 +41,11 @@ public class LoginService
     public User login(String username, String password)
     {
         // 验证码校验
-        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
-            throw new CaptchaException();
-        }
+//        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
+//        {
+//            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+//            throw new CaptchaException();
+//        }
         // 用户名或密码为空 错误
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
         {
@@ -109,11 +109,11 @@ public class LoginService
     public User login(String username, String password,Integer userSource)
     {
         // 验证码校验
-        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
-            throw new CaptchaException();
-        }
+//        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
+//        {
+//            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+//            throw new CaptchaException();
+//        }
         // 用户名或密码为空 错误
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
         {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/kingdee/controller/KingdeeDataSyncController.java

@@ -55,7 +55,6 @@ public class KingdeeDataSyncController {
     @RequestMapping("/syncUser")
     public Map<String, Object> syncUser(SyncUser syncUser) {
         try {
-            System.out.println("接收到推送数据-金蝶用户-----" + DateTime.now() + "----------" + syncUser);
             return kingdeeDataSyncService.syncUser(syncUser);
         } catch (Exception e) {
             HashMap<String, Object> resultData = new HashMap<>();
@@ -75,7 +74,6 @@ public class KingdeeDataSyncController {
     @RequestMapping("/syncOrg")
     public Map<String, Object> syncOrg(SyncOrganization syncOrg) {
         try {
-            System.out.println("接收到推送数据-金蝶组织结构-----" + DateTime.now() + "----------" + syncOrg);
             Map<String, Object> objectMap = kingdeeDataSyncService.syncOrg(syncOrg);
             return objectMap;
         } catch (Exception e) {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/kingdee/service/impl/KingdeeDataSyncServiceImpl.java

@@ -20,6 +20,8 @@ import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.Post;
 import com.zdxt.domain.auth.User;
 import com.zdxt.domain.auth.UserPost;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +39,7 @@ import java.util.Map;
  */
 @Service
 public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
+    private static final Logger log = LoggerFactory.getLogger(KingdeeDataSyncServiceImpl.class);
 
     @Autowired
     private IUserService userService;
@@ -60,7 +63,7 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
     @Transactional
     public Map<String, Object> syncUser(SyncUser syncUser) throws KingdeeDataSyncException {
         if (StrUtil.isEmpty(syncUser.getId())) {
-            System.out.println("金蝶用户id不能为空-----" + DateUtil.now());
+            log.info("金蝶用户id不能为空-----{}" , DateUtil.now());
             throw new KingdeeDataSyncException(500, "金蝶用户id不能为空");
         }
 
@@ -77,7 +80,7 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
             row = userMapper.insertUser(user);
 
             if (row == 0) {
-                System.out.println("金蝶用户新增失败-----" + DateUtil.now());
+                log.info("金蝶用户新增失败-----：{}", DateUtil.now());
                 resultData.put("msg", "金蝶用户新增失败");
                 return resultData;
             }
@@ -88,7 +91,7 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
             row = userService.deleteUserById(user.getUserId());
 
             if (row == 0) {
-                System.out.println("金蝶用户删除失败-----" + DateUtil.now());
+                log.info("金蝶用户删除失败-----{}" , DateUtil.now());
                 resultData.put("msg", "金蝶用户删除失败");
                 return resultData;
             }
@@ -99,7 +102,7 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
             row = userMapper.updateUser(user);
 
             if (row == 0) {
-                System.out.println("金蝶用户更新失败-----" + DateUtil.now());
+                log.info("金蝶用户更新失败-----{}" , DateUtil.now());
                 resultData.put("msg", "金蝶用户更新失败");
                 return resultData;
             }
@@ -108,7 +111,6 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
         }
 
         resultData.put("result", true);
-        System.out.println("金蝶组织用户数据同步成功-----" + DateTime.now() + "----------" + syncUser);
         return resultData;
     }
 
@@ -232,7 +234,6 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
         }
 
         resultData.put("result", true);
-        System.out.println("金蝶组织结构数据同步成功-----" + DateTime.now() + "----------" + syncOrg);
         return resultData;
     }
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java

@@ -74,6 +74,15 @@ public class DeptController extends BaseController {
         return deptList;
     }
 
+    @PostMapping("/listChild")
+    @ResponseBody
+    public List<Dept> listChild(Dept dept)
+    {
+        List<Dept> deptList = deptService.selectDeptList(dept);
+        return deptList;
+    }
+
+
     /**
      * 新增部门
      */
@@ -100,6 +109,7 @@ public class DeptController extends BaseController {
         return toAjax(deptService.insertDept(dept));
     }
 
+
     /**
      * 修改
      */
@@ -303,4 +313,5 @@ public class DeptController extends BaseController {
     public String toUserCheckOptSelect() {
         return prefix + "/userCheckOpt";
     }
+
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@@ -763,7 +763,6 @@ public class UserServiceImpl implements IUserService {
                         insertNum += rowNum;
                     }
                 }
-
             } catch (Exception e) {
                 continue;
             }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml

@@ -164,7 +164,10 @@
             AND d.tenant_code = #{tenantCode}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            ${params.dataScope}
+        </if>
+
         order by d.parent_id, d.order_num
     </select>
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -152,8 +152,10 @@
         <if test="tenantCode != @com.zdxt.auth.common.constant.Constants@DEFAULT_TENANT_CODE and tenantCode != null and tenantCode != ''">
             AND u.tenant_code = #{tenantCode}
         </if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
     </select>
 
     <select id="selectUserListByHave" parameterType="User" resultMap="UserResult">
@@ -199,8 +201,10 @@
         </if>
         AND  u.law_certificate_num is not null
         AND  u.law_certificate_num !=""
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
     </select>
     <select id="selectUserListByDeptId" parameterType="User" resultMap="UserResult">
         select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
@@ -222,7 +226,10 @@
         </if>
         AND  u.law_certificate_num is not null
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
     </select>
     <select id="selectUserListByNoPermission" parameterType="User" resultMap="UserResult">
         select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber,
@@ -279,7 +286,10 @@
             AND u.tenant_code = #{tenantCode}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
     </select>
 
     <select id="selectUnallocatedList" parameterType="User" resultMap="UserResult">
@@ -307,7 +317,10 @@
             AND u.tenant_code = #{tenantCode}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
     </select>
 
     <select id="selectUserByLoginName" parameterType="String" resultMap="UserResult">

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/oracle/DeptOracleDao.xml

@@ -100,7 +100,10 @@
             AND status = #{status}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
         order by d.parent_id, d.order_num
     </select>
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/oracle/RoleOracleDao.xml

@@ -55,7 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and r.create_time <= to_date(#{params.endTime},'yyyy-MM-dd HH24:mi:ss')
 		</if>
 		<!-- 数据范围过滤 -->
-		${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
 	</select>
 
 	<select id="selectRolesByUserId" parameterType="Long" resultMap="RoleResult">

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/logback.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+    <contextName>logback</contextName>
+
+    <property name="zdxtEmergencyBootStart.path" value="/usr/local/zdxtEmergencyBootStart/logs/zdxtEmergencyBootStart.log"/>
+    <property name="zdxtEmergencyBootStart.error.path" value="/usr/local/zdxtEmergencyBootStart/logs/zdxtEmergencyBootStart.error.log"/>
+    <!--有线报警数据日志-->
+<!--    <property name="zdxtEmergencyBootStart.realtimeWarnHandler.path" value="/usr/local/zdxtEmergencyBootStart/logs/realtimeWarnHandler.log"/>-->
+    <!--mqtt数据日志-->
+<!--    <property name="zdxtEmergencyBootStart.warningMessageCallback.path" value="/usr/local/zdxtEmergencyBootStart/logs/warningMessageCallback.log"/>-->
+    <!--mqtt缓存数据日志-->
+<!--    <property name="zdxtEmergencyBootStart.iotMessageTask.path" value="/usr/local/zdxtEmergencyBootStart/logs/iotMessageTask.log"/>-->
+
+    <property name="historyLogPath" value="/usr/local/zdxtEmergencyBootStart/logs/history"/>
+
+    <!-- 异步任务日志 -->
+<!--    <property name="zdxtEmergencyBootStart.asyncTask.path" value="/usr/local/qn-worksite/logs/zdxtEmergencyBootStart.asyncTask.log"/>-->
+
+    <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>
+                %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="zdxtEmergencyBootStart" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${zdxtEmergencyBootStart.path}</file>
+        <!-- 过滤日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>  <!-- 如果命中就禁止这条日志 -->
+            <onMismatch>ACCEPT</onMismatch>  <!-- 如果没有命中就使用这条规则 -->
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${historyLogPath}/%d{yyyy-MM-dd}/zdxtEmergencyBootStart.zip</fileNamePattern>
+            <maxHistory>180</maxHistory>
+<!--            <maxFileSize>500MB</maxFileSize>-->
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="zdxtEmergencyBootStart-error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${zdxtEmergencyBootStart.error.path}</file>
+        <!-- 过滤日志 -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${historyLogPath}/%d{yyyy-MM-dd}/zdxtEmergencyBootStart-error.zip</fileNamePattern>
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <logger name="com.zdxt" level="INFO" additivity="false">
+        <appender-ref ref="zdxtEmergencyBootStart" />
+        <appender-ref ref="zdxtEmergencyBootStart-error"/>
+<!--        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>-->
+<!--        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>-->
+<!--        <appender-ref ref="zdxtEmergencyBootStart-iotMessageTask"/>-->
+    </logger>
+
+    <logger name="org.springframework" level="INFO" additivity="false">
+        <appender-ref ref="zdxtEmergencyBootStart" />
+        <appender-ref ref="zdxtEmergencyBootStart-error"/>
+<!--        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>-->
+<!--        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>-->
+<!--        <appender-ref ref="zdxtEmergencyBootStart-iotMessageTask"/>-->
+    </logger>
+
+
+    <root level="INFO">
+        <appender-ref ref="zdxtEmergencyBootStart"/>
+        <appender-ref ref="zdxtEmergencyBootStart-error"/>
+<!--        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>-->
+<!--        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>-->
+<!--        <appender-ref ref="zdxtEmergencyBootStart-iotMessageTask"/>-->
+        <appender-ref ref="consoleAppender"/>
+    </root>
+<!--    <root level="ERROR">
+        <appender-ref ref="zdxtEmergencyBootStart"/>
+        <appender-ref ref="zdxtEmergencyBootStart-error"/>
+        <appender-ref ref="zdxtEmergencyBootStart-realtimeWarnHandler"/>
+        <appender-ref ref="zdxtEmergencyBootStart-warningMessageCallback"/>
+        <appender-ref ref="consoleAppender"/>
+    </root>-->
+</configuration>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/include.html

@@ -30,7 +30,8 @@
 	<script th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script>
 	<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js}"></script>
 	<!-- jquery-validate 表单树插件 -->
-	<script th:src="@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.js}"></script>
+<!--	<script th:src="@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.js}"></script>-->
+    <script th:src="@{/ajax/libs/bootstrap-treetable/bootstrap-table-tree.min.js}"></script>
 	<!-- jquery-export 表格导出插件 -->
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.js}"></script>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/index_t.html

@@ -350,6 +350,7 @@
 <script src="/workStyle/tabler/libs/jsvectormap/dist/js/jsvectormap.min.js" defer></script>
 <script src="/workStyle/tabler/libs/jsvectormap/dist/maps/world.js" defer></script>
 <script src="/workStyle/tabler/libs/jsvectormap/dist/maps/world-merc.js" defer></script>
+<script src="/js/purify/purify.js"></script>
 <!-- Tabler Core -->
 <script src="/workStyle/tabler/js/tabler.min.js" defer></script>
 <script src="/workStyle/tabler/js/demo.min.js" defer></script>
@@ -357,7 +358,7 @@
 <script>
     $(function () {
         queryMu();
-    })
+    });
     function queryMu(){
         $.ajax({
             url: "system/queryStyleMenus",
@@ -372,38 +373,38 @@
                    for(var i=0;i<result.data.length;i++){
                        if(result.data[i].menuVo.menus.length==1&&(result.data[i].menuVo.menus[0].children.length==0)){
                            if(i==0){
-                               html+="<li class='nav-item active'>"
+                               html+="<li class='nav-item active'>";
                                $("#iframeId").attr("src",result.data[i].menuVo.menus[0].url).attr("height",document.body.clientHeight)
                                // $("#iframeId").attr("src", result.data[i].menuVo.menus[0].url)
                            }else{
                                html+="<li class='nav-item'>"
                            }
                            // html+="<li class='nav-item active'>"
-                           html+=" <a class='nav-link' onclick='num(this);' dataurl='"+result.data[i].menuVo.menus[0].url+"'>"
+                           html+=" <a class='nav-link' onclick='num(this);' dataurl='"+result.data[i].menuVo.menus[0].url+"'>";
                            // html+="<span class=\"nav-link-icon d-md-none d-lg-inline-block\">"
-                           html+="<i class='"+result.data[i].systemCodeDto.remark+"'></i>"
+                           html+="<i class='"+result.data[i].systemCodeDto.remark+"'></i>";
                            // html+="</span>"
-                           html+="<span class=\"nav-link-title\">"+result.data[i].systemCodeDto.dictLabel+"</span>"
+                           html+="<span class=\"nav-link-title\">"+result.data[i].systemCodeDto.dictLabel+"</span>";
                            html+="</a></li>"
                        }else{
-                           html+="<li class=\"nav-item dropdown\">"
+                           html+="<li class=\"nav-item dropdown\">";
                            html+=" <a class=\"nav-link dropdown-toggle\" href=\"#navbar-base\" data-bs-toggle=\"dropdown\"\n" +
-                           "                               data-bs-auto-close=\"outside\" role=\"button\" aria-expanded=\"false\">"
-                           html+="<i class='"+result.data[i].systemCodeDto.remark+"'></i>"
-                           html+=" <span class=\"nav-link-title\">"+result.data[i].systemCodeDto.dictLabel+"</span>"
-                           html+=" </span></a>"
-                           html+="<div class=\"dropdown-menu\"><div class=\"dropdown-menu-columns\"><div class=\"dropdown-menu-column\">"
+                           "                               data-bs-auto-close=\"outside\" role=\"button\" aria-expanded=\"false\">";
+                           html+="<i class='"+result.data[i].systemCodeDto.remark+"'></i>";
+                           html+=" <span class=\"nav-link-title\">"+result.data[i].systemCodeDto.dictLabel+"</span>";
+                           html+=" </span></a>";
+                           html+="<div class=\"dropdown-menu\"><div class=\"dropdown-menu-columns\"><div class=\"dropdown-menu-column\">";
                            for(var j=0;j<result.data[i].menuVo.menus.length;j++){
                                if(result.data[i].menuVo.menus[j].children.length==0){
                                    html+="<a class=\"dropdown-item\" href="+result.data[i].menuVo.menus[j].url+">"+result.data[i].menuVo.menus[j].menuName+"</a>"
                                }else{
                                    html+="<div class=\"dropend\"><a class=\"dropdown-item dropdown-toggle\" href=\"#sidebar-cards\"\n" +
                                        "                                               data-bs-toggle=\"dropdown\" data-bs-auto-close=\"outside\" role=\"button\"\n" +
-                                       "                                               aria-expanded=\"false\">"
-                                   html+=result.data[i].menuVo.menus[j].menuName
-                                   html+="</a><div class=\"dropdown-menu\">"
+                                       "                                               aria-expanded=\"false\">";
+                                   html+=result.data[i].menuVo.menus[j].menuName;
+                                   html+="</a><div class=\"dropdown-menu\">";
                                    for(var k=0;k<result.data[i].menuVo.menus[j].children.length;k++){
-                                       html+=" <a onclick='num(this);' dataurl="+result.data[i].menuVo.menus[j].children[k].url+" class=\"dropdown-item\">"+result.data[i].menuVo.menus[j].children[k].menuName
+                                       html+=" <a onclick='num(this);' dataurl="+result.data[i].menuVo.menus[j].children[k].url+" class=\"dropdown-item\">"+result.data[i].menuVo.menus[j].children[k].menuName;
                                        html+="</a>"
                                    }
                                    html+="</div> </div>"
@@ -414,7 +415,7 @@
                        }
 
                    }
-                   $("#conent").html(html)
+                   $("#conent").html(DOMPurify.sanitize(html))
                 }
                 if(result.code == 1){
 
@@ -426,12 +427,12 @@
         })
     }
     function num(obj){
-        $("li").removeClass('active')
-        $(obj).parents("li").addClass('active')
-        $("a").removeClass('active')
-        $(obj).addClass('active').parent().siblings('a').addClass('active')
-        $("#iframeId").attr("src",$(obj).attr("dataurl")).attr("height",document.body.clientHeight-110)
-        $("a").removeClass('show')
+        $("li").removeClass('active');
+        $(obj).parents("li").addClass('active');
+        $("a").removeClass('active');
+        $(obj).addClass('active').parent().siblings('a').addClass('active');
+        $("#iframeId").attr("src",$(obj).attr("dataurl")).attr("height",document.body.clientHeight-110);
+        $("a").removeClass('show');
         $("div").removeClass('show')
         // alert($(obj).attr("dataurl"))
     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login-1.html

@@ -21,7 +21,7 @@
     <link href="../static/css/style.default.css" th:href="@{/css/style.default.css}" rel="stylesheet"/>
 
     <script>
-        if(window.top!==window.self){window.top.location=window.location};
+
     </script>
 </head>
 
@@ -145,14 +145,14 @@
         /*登录*/
         $("#login").click(function(){
             login();
-        })
+        });
 
         $(document).keypress(function (e) {
             if (e.keyCode == 13){
                 login();
             }
         })
-    })
+    });
 
     /**
      * 登录

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html

@@ -87,15 +87,15 @@
 <input class="pwsty" type="password" placeholder="请输入密码" id="login-password" name="password" />
 
 <!--<a href="#" class="fortxt">忘记密码？</a> -->
-<div class="vcbox" th:if="${captchaEnabled==true}">
-    <div class="inptit">验证码</div>
-    <input class="vcsty" type="text" placeholder="请输入验证码" name="validateCode" maxlength="6" autocomplete="off" />
-    <div class="vcode">
-        <a href="javascript:void(0);" title="点击更换验证码">
-            <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-        </a>
-    </div>
-</div>
+<!--<div class="vcbox" th:if="${captchaEnabled==true}">-->
+<!--    <div class="inptit">验证码</div>-->
+<!--    <input class="vcsty" type="text" placeholder="请输入验证码" name="validateCode" maxlength="6" autocomplete="off" />-->
+<!--    <div class="vcode">-->
+<!--        <a href="javascript:void(0);" title="点击更换验证码">-->
+<!--            <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>-->
+<!--        </a>-->
+<!--    </div>-->
+<!--</div>-->
    <div class="logindiv">
        <div>
            <input class="checksty" name="" type="checkbox" value="" checked="checked" /><span class="remtxt">记住密码</span>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login_v1.html

@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
-        if(window.top!==window.self){window.top.location=window.location};
+
     </script>
 </head>
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/add.html

@@ -40,14 +40,14 @@
     <th:block th:include="zdxtInclude :: footer" />
     <th:block th:include="zdxtInclude :: bootstrap-fileinput-js"/>
     <script type="text/javascript">
-        var prefix = ctx + "code/audit"
+        var prefix = ctx + "code/audit";
         $("#form-audit-add").validate({
             focusCleanup: true
         });
         $(function () {
-            var filePreview = { fileList: null, previewRespDTOS: null }
+            var filePreview = { fileList: null, previewRespDTOS: null };
             initFile("fileinput", prefix + "/add", filePreview);
-        })
+        });
 
         function submitHandler() {
             // if ($.validate.form()) {
@@ -64,10 +64,10 @@
 
             var fd = new FormData();
             fd.append('file', file_obj);
-            fd.append('planName', planName.value);
-            fd.append('planDesc', planDesc.value);
+            fd.append('planName', DOMPurify.sanitize(planName.value));
+            fd.append('planDesc', DOMPurify.sanitize(planDesc.value));
             xhr = new XMLHttpRequest();
-            xhr.open('POST', prefix + "/add", true)
+            xhr.open('POST', prefix + "/add", true);
             xhr.send(fd);
             xhr.onreadystatechange = function () {
                 //后端接受完毕
@@ -183,7 +183,7 @@
             $("#fileinput").on("filebatchuploadsuccess", function (event, data, previewId, index) {
                 fileUploadCallBack(data.response);
             })
-        };
+        }
 
         function fileUploadCallBack(result) {
             var parent = window.parent;

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <li id="complaintB" th:fragment="complaintB">
         <p><span th:text="|${year}年:|"></span></p>
+        <p><label th:text="总数量"></label><b th:text="${total}"></b></p>
         <p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
         <p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
     </li>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html

@@ -165,6 +165,7 @@
                             <ul>
                                 <li id="complaintB" th:fragment="complaintB">
                                     <p><span th:text="|${year}年:|"></span></p>
+                                    <p><label th:text="总数量"></label><b th:text="${Number3}"></b></p>
                                     <p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
                                     <p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
                                 </li>
@@ -230,7 +231,7 @@
             $('#cont-two-2').hide();
             $('#cont-two-3').hide();
             rTable2();
-        }
+        };
         $(function() {
             var options1 = {
                 modalName: "执法投诉统计",
@@ -291,7 +292,7 @@
                         }
                     },
                 ]
-            }
+            };
             $("#bootstrap-table2").bootstrapTable(options2);
         });
         $(function() {
@@ -324,7 +325,7 @@
                         }
                     },
                 ]
-            }
+            };
             $("#bootstrap-table3").bootstrapTable(options);
         });
         $(function() {
@@ -357,7 +358,7 @@
                         }
                     },
                 ]
-            }
+            };
             $("#bootstrap-table4").bootstrapTable(options);
         });
         $(function() {
@@ -420,7 +421,7 @@
                         title : '投诉时间'
                     },
                     ]
-            }
+            };
             $("#bootstrap-table").bootstrapTable(options3);
         });
         function dataMake(res){
@@ -438,14 +439,14 @@
                 d.name = res[i].name;
                 d.value = res[i].numInt;
                 d.percentage = res[i].percentage;
-                console.log(d)
+                console.log(d);
                 newData.push(d);
             }
             return newData;
         }
 
         function setTab(prefix, num, total) {
-            console.log( document.getElementById(`${prefix}1`))
+            console.log( document.getElementById(`${prefix}1`));
             for (let i = 1; i <= total; i++) {
                 document.getElementById(`${prefix}${i}`).classList.remove('actit');
                 document.getElementById(`${prefix}-tab${i}`).classList.remove('active');
@@ -468,7 +469,7 @@
         }
         function searchComplaint2 () {
             var qy = document.getElementById("qy");
-            console.log(qy.value)
+            console.log(qy.value);
             if(qy.value==""){
                 $('#cont-two-1').hide();
                 $('#cont-two-2').show();
@@ -493,12 +494,13 @@
                 type:'GET',
                 data:params,
                 success: function (response) {
+                    console.log(response);
                     $('#complaintB').html(response);
                 }
             })
         }
         function rTable1(){
-            var currentId=$('form').eq(0).attr('id')
+            var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
             $.ajax({
                 url: prefix + "/list1",
@@ -512,7 +514,7 @@
             })
         }
         function rTable2(){
-            var currentId=$('form').eq(1).attr('id')
+            var currentId=$('form').eq(1).attr('id');
             var params = $.common.formToJSON(currentId);
             $.ajax({
                 url: prefix + "/list2",
@@ -564,7 +566,7 @@
                                 },
                                 data: pieData,
                             }]
-                        }
+                        };
                         myChart1.setOption(option3);
                 },
                 error:function (xhr,status,error){
@@ -573,7 +575,7 @@
             })
         }
         function rTable3(){
-            var currentId=$('form').eq(1).attr('id')
+            var currentId=$('form').eq(1).attr('id');
             var params = $.common.formToJSON(currentId);
             params.qy=null;
             $.ajax({
@@ -626,7 +628,7 @@
                             },
                             data: pieData,
                         }]
-                    }
+                    };
                     myChart2.setOption(option);
                 },
                 error:function (xhr,status,error){
@@ -635,7 +637,7 @@
             })
         }
         function rTable4(){
-            var currentId=$('form').eq(1).attr('id')
+            var currentId=$('form').eq(1).attr('id');
             var params = $.common.formToJSON(currentId);
             $.ajax({
                 url: prefix + "/jdComplaintList",
@@ -687,7 +689,7 @@
                             },
                             data: pieData,
                         }]
-                    }
+                    };
                     myChart3.setOption(option);
                 },
                 error:function (xhr,status,error){
@@ -697,7 +699,7 @@
         }
         function timeType1() {
             var dateSearch = document.getElementById("dateSearch");
-            console.log(dateSearch.value)
+            console.log(dateSearch.value);
             if(dateSearch.value=="quarter"){
                 $("#quarter").show();
                 $("#month").hide();
@@ -715,7 +717,7 @@
         }
         function timeType2() {
             var dateSearch = document.getElementById("dateSearch2");
-            console.log(dateSearch.value)
+            console.log(dateSearch.value);
             if(dateSearch.value=="quarter"){
                 $("#quarter2").show();
                 $("#month2").hide();
@@ -732,7 +734,7 @@
             }
         }
         function sComplaint(eName){
-            var currentId=$('form').eq(0).attr('id')
+            var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
             params.name=eName;
             $.ajax({

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html

@@ -103,14 +103,14 @@
     });
     function deptSearch(){
         $.table.search();
-        var currentId=$('form').eq(0).attr('id')
+        var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
         $.ajax({
             url:prefix+'/searchType',
             type:'GET',
             data:params,
             success: function (response) {
-                $('#b').html(response);
+                $('#b').html(DOMPurify.sanitize(response));
             }
         })
     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html

@@ -257,7 +257,7 @@
                 }
 
                 var tabStr = fillTable(tmpList);
-                document.getElementById("echartLineTable").innerHTML = tabStr;
+                document.getElementById("echartLineTable").innerHTML = DOMPurify.sanitize(tabStr);
 
                 itemAnalysis(caseAnalysisTitle, caseAnalysisNum);
             },
@@ -492,7 +492,7 @@
                 }
 
                 var tabStr = fillTable(items);
-                document.getElementById("echartRingTable").innerHTML = tabStr;
+                document.getElementById("echartRingTable").innerHTML = DOMPurify.sanitize(tabStr);
 
                 caseAnalysis(items);
             },
@@ -566,7 +566,7 @@
                 }
 
                 var tabStr = fillTable(tmpList);
-                document.getElementById("echartEnforcerTable").innerHTML = tabStr;
+                document.getElementById("echartEnforcerTable").innerHTML = DOMPurify.sanitize(tabStr);
 
                 enforcerAnalysis(enforcers, nums);
             },
@@ -727,7 +727,7 @@
                 }
 
                 var tabStr = fillTable(tmpList);
-                document.getElementById("echartSortTable").innerHTML = tabStr;
+                document.getElementById("echartSortTable").innerHTML = DOMPurify.sanitize(tabStr);
 
                 enterpriseSortAnalysis(categorys, barDatas);
             },
@@ -870,7 +870,7 @@
                 }
 
                 var tabStr = fillTable(items);
-                document.getElementById("echartTypeTable").innerHTML = tabStr;
+                document.getElementById("echartTypeTable").innerHTML = DOMPurify.sanitize(tabStr);
 
                 enterpriseAnalysis(items);
             },

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html

@@ -174,7 +174,7 @@
         $("#jd").hide();
         $('#bootstrap-table').hide();
         $('#closeButton').hide();
-    }
+    };
     $(function() {
         var options1 = {
             modalName: "企业统计",
@@ -271,12 +271,12 @@
                     title : '占比'
                 },
             ]
-        }
+        };
         $("#bootstrap-table2").bootstrapTable(options2);
     });
 
     function setTab(prefix, num, total) {
-        console.log( document.getElementById(`${prefix}1`))
+        console.log( document.getElementById(`${prefix}1`));
         for (let i = 1; i <= total; i++) {
             document.getElementById(`${prefix}${i}`).classList.remove('actit');
             document.getElementById(`${prefix}-tab${i}`).classList.remove('active');
@@ -296,20 +296,20 @@
         frag1();
     }
     function frag1(){
-        var currentId=$('form').eq(0).attr('id')
+        var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
             $.ajax({
                 url:prefix+'/frag1',
                 type:'GET',
                 data:params,
                 success: function (response) {
-                    $('#fragmentE').html(response);
+                    $('#fragmentE').html(DOMPurify.sanitize(response));
                 }
             })
 
     }
     function eTable1(){
-        var currentId=$('form').eq(0).attr('id')
+        var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
         $.ajax({
             url: prefix + "/listQY",
@@ -324,7 +324,7 @@
         })
     }
     function eTable2(){
-        var currentId=$('form').eq(1).attr('id')
+        var currentId=$('form').eq(1).attr('id');
         var params = $.common.formToJSON(currentId);
         $.ajax({
             url: prefix + "/type",
@@ -400,7 +400,7 @@
                         },
                         data: eData,
                     }]
-                }
+                };
                 myChart.setOption(option3);
             },error:function (xhr,status,error){
                 console.error("请求失败：",status,error);
@@ -417,16 +417,16 @@
             type:'GET',
             data:params,
             success: function (response) {
-                $('#enterpriseFragment').html(response);
+                $('#enterpriseFragment').html(DOMPurify.sanitize(response));
             }
         })
-    };
+    }
 
     function jd(n){
         let nameData={};
         nameData.name=n;
-        console.log(n)
-        console.log(nameData)
+        console.log(n);
+        console.log(nameData);
         $.ajax({
             url:prefix+'/listJD',
             type:'GET',
@@ -476,7 +476,7 @@
                     ]
                 };
                 $("#bootstrap-table").bootstrapTable(options);
-                console.log(response)
+                console.log(response);
                 $('#closeButton').show();
                 $('#bootstrap-table').show();
                 $('#bootstrap-table1').hide();
@@ -494,7 +494,7 @@
 
     function timeType2() {
         var dateSearch = document.getElementById("dateSearch2");
-        console.log(dateSearch.value)
+        console.log(dateSearch.value);
         if(dateSearch.value=="quarter"){
             $("#quarter2").show();
             $("#month2").hide();
@@ -513,7 +513,7 @@
 
     function addressMake(){
         var dateSearch = document.getElementById("qy");
-        console.log(dateSearch.value)
+        console.log(dateSearch.value);
         if(dateSearch.value!=null&&dateSearch.value!=""){
             $("#jd").show();
             $.ajax({
@@ -521,7 +521,7 @@
                 type:'GET',
                 data: {"name":dateSearch.value},
                 success: function (response) {
-                    $('#jd').html(response);
+                    $('#jd').html(DOMPurify.sanitize(response));
                 }
             })
         }else {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html

@@ -136,7 +136,7 @@
             type: 'GET',
             data: params,
             success: function (response) {
-                $('#fragmentW').html(response);
+                $('#fragmentW').html(DOMPurify.sanitize(response));
             }
         })
     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/dept/dept.html

@@ -50,20 +50,25 @@
 	var editFlag = [[${@permission.hasPermi('system:dept:edit')}]];
 	var removeFlag = [[${@permission.hasPermi('system:dept:remove')}]];
 	var datas = [[${@dict.getType('sys_normal_disable')}]];
-	var prefix = ctx + "system/dept"
+	var prefix = ctx + "system/dept";
 
 	$(function() {
 		var options = {
 			code: "deptId",
 			parentCode: "parentId",
 			uniqueId: "deptId",
+            expandAll: false,
+            expandFirst: false,
+            expandColumn: 1,
 			url: prefix + "/list",
 			createUrl: prefix + "/add/{id}",
 			updateUrl: prefix + "/edit/{id}",
 			removeUrl: prefix + "/remove/{id}",
+            dataUrl: prefix + "/tree/listChild",
 			bordered: true,
+            onClickRow: onClickRow,
 			modalName: "部门",
-			height:$(window).height()-$(".search-collapse").height()-$("#toolbar").height()-65,
+			height: $(window).height()-$(".search-collapse").height()-$("#toolbar").height()-65,
 			columns: [{
 				field: 'selectItem',
 				radio: true
@@ -109,6 +114,10 @@
 		};
 		$.treeTable.init(options);
 	});
+
+    function onClickRow(row, $element){
+//         	alert("单击行id：" + row.id + " name：" + row.name);
+    }
 </script>
 </body>
 </html>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html

@@ -129,9 +129,9 @@
 
 		function queryUserList() {
 			var importb = [[${@permission.hasPermi('system:user:import')}]];
-			var importboolen = (importb==""?true:false)
+			var importboolen = (importb==""?true:false);
 			var exportb = [[${@permission.hasPermi('system:user:export')}]];
-			var exportboolen = (exportb==""?true:false)
+			var exportboolen = (exportb==""?true:false);
 			// alert($(window).height()-$(".search-collapse").height()-$("#toolbar").height())
 			// alert($(".select-table").height())
 		    var options = {
@@ -205,10 +205,10 @@
 		            title: '邮箱',
 		            visible: false
 		        },*/
-		        {
-		            field: 'phonenumber',
-		            title: '手机号码'
-		        },
+		        // {
+		        //     field: 'phonenumber',
+		        //     title: '手机号码'
+		        // },
 		        {
 		        	visible: editFlag == 'hidden' ? false : true,
 		        	title: '用户状态',
@@ -375,7 +375,7 @@
 					var nodes = $._tree.getNodes();
 					if (nodes.length > 0) {
 						console.log("sss");
-						$._tree.selectNode(nodes[0])
+						$._tree.selectNode(nodes[0]);
 						$("#deptId").val(nodes[0].id);
 						$("#parentId").val(nodes[0].pId);
 						$.table.search();

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/userAssist/user.html

@@ -126,9 +126,9 @@
 
     function queryUserList() {
         var importb = [[${@permission.hasPermi('system:user:import')}]];
-        var importboolen = (importb == "" ? true : false)
+        var importboolen = (importb == "" ? true : false);
         var exportb = [[${@permission.hasPermi('system:user:export')}]];
-        var exportboolen = (exportb == "" ? true : false)
+        var exportboolen = (exportb == "" ? true : false);
         var options = {
             url: prefix + "/list",
             createUrl: prefix + "/add",
@@ -195,10 +195,10 @@
                         return po;
                     }
                 },
-                {
-                    field: 'phonenumber',
-                    title: '手机号码'
-                },
+                // {
+                //     field: 'phonenumber',
+                //     title: '手机号码'
+                // },
                 {
                     visible: editFlag == 'hidden' ? false : true,
                     title: '用户状态',
@@ -357,7 +357,7 @@
             var nodes = $._tree.getNodes();
             if (nodes.length > 0) {
                 console.log("sss");
-                $._tree.selectNode(nodes[0])
+                $._tree.selectNode(nodes[0]);
                 $("#deptId").val(nodes[0].id);
                 $("#parentId").val(nodes[0].pId);
                 $.table.search();

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/video/video.html

@@ -132,7 +132,7 @@
                     html+='     </div>';
                     html+='</div>';
                 }
-                $("#videoList").html(html);
+                $("#videoList").html(DOMPurify.sanitize(html));
             });
         },
         //发布
@@ -191,7 +191,7 @@
         uploadFiles: function () {
             $.modal.open("上传文件", prefix + "add",800,650)
         }
-    }
+    };
 
     videoUtil.init();
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/zdxtInclude.html

@@ -41,6 +41,7 @@
 	<script th:src="@{/ajax/libs/layui/layui.js}"></script>
 	<script th:src="@{/ruoyi/js/common.js?v=4.1.0}"></script>
 	<script th:src="@{/ruoyi/js/zdxtUtil.js?v=4.1.0}"></script>
+	<script th:src="@{/js/purify/purify.js}"></script>
 	<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 </div>
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java

@@ -118,6 +118,7 @@ public class ComplaintStaticController extends BaseController {
         }else {
             model.addAttribute("dou", "0.00%");
         }
+        model.addAttribute("total",complaintStatisticsAllList.size());
         return prefix+"/complaintB";
     }
     @RequiresPermissions("code:complaintStatic:list")
@@ -186,7 +187,7 @@ public class ComplaintStaticController extends BaseController {
         font2.setFontName("微软雅黑");
         font2.setBold(true);
         font2.setFontHeightInPoints((short) 11);
-        HSSFCellStyle styleRow2=workbook.createCellStyle();
+        HSSFCellStyle styleRow2=workbook.createCellStyle(); 
         styleRow2.setWrapText(true);//换行
         styleRow2.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
         styleRow2.setFillPattern(FillPatternType.SOLID_FOREGROUND);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -246,6 +246,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 enforcementRegistrationMapper.selectEnforcementRegistrationList1(enforcementRegistration);
         return enforcementRegistrations;
     }
+    @DataScope(deptAlias = "r",userAlias = "r")
     @Override
     public List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration) {
         List<EnforcementRegistration> enforcementRegistrations =
@@ -542,6 +543,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 enforcementRegistrationMapper.staticEnforcementRegistration(enforcementRegistrationDto);
         return enforcementRegistrationDtos;
     }
+    @DataScope(deptAlias = "r",userAlias = "r")
     @Override
     public List<EnforcementRegistrationDto> staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto) {
         if(enforcementRegistrationDto.getQy()!=null&&!"".equals(enforcementRegistrationDto.getQy())){

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -317,7 +317,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         //证件号解密
         String s = IdCardCryptoUtil.symmetricDecryptIdCard(srzSecretKey, userIdCard);
         System.out.println("======身份证解密========");
-        System.out.println(s);
+        log.info(s);
         System.out.println("==============");
         List<Zfryjdm2405301> zfryjdm2405301s = xzjcjbxx025711Mapper.queryZFRYByIdCard(s);
         System.out.println("======解密后查询========");

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java

@@ -216,7 +216,7 @@ public class HttpUtil {
                     response.append(inputLine);
                 }
                 in.close();
-                System.out.println(response.toString());
+                log.info(response.toString());
                 System.out.println("请求成功");
                 return response.toString();
             }else{

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/ZwSmsClient.java

@@ -71,7 +71,6 @@ public class ZwSmsClient {
         call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);
 
         String result = (String) call.invoke(new Object[]{username, password, "2409", sendbody});
-        System.out.println(result);//打印返回的结果
         return result;
     }
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml

@@ -25,7 +25,7 @@
         <where>
             <if test="deptId != null  and deptId != ''">and find_in_set(#{deptId},s.ancestors)</if>
             <if test="year != null  and year != ''">and (year(e.create_time)=#{year})</if>
-            <if test="month != null  and month != ''">and (month(e.create_time)in(${month}))</if>
+            <if test="month != null  and month != ''">and (month(e.create_time)in(#{month}))</if>
         </where>
         order by e.enterprise_name
     </select>
@@ -38,7 +38,7 @@
         <where>
             and !find_in_set((select dept_id from sys_dept where dept_name="区"),s.ancestors)
             <if test="year != null  and year != ''">and (year(e.create_time)=#{year})</if>
-            <if test="month != null  and month != ''">and (month(e.create_time)in(${month}))</if>
+            <if test="month != null  and month != ''">and (month(e.create_time)in(#{month}))</if>
         </where>
         order by e.enterprise_name
     </select>
@@ -48,26 +48,26 @@
     </select>
 
     <select id="selectAllStatisticsList" parameterType="EnforcementCheckStatistics" resultMap="EnforcementCheckStatisticsResult">
-        select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.remark,i.enterprise_address
-        from enforcement_registration e
-        left join sys_dept s on e.bureau_dept_id=s.dept_id
-        left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on e.enterprise_number=i.enterprise_number
-        <where>
-            and (e.enterprise_number not like "92440300MACQUM2M9C"
-            or e.enterprise_number is null)
-            and e.bureau_dept_name is not null
-            and e.law_enforcement_id is not null
-            and e.enterprise_name is not null
-            and e.enterprise_number is not null
-            and e.law_enforcer is not null
-            and e.law_enforcer_two is not null
-            and e.is_complaint is not null
-            and e.check_category is not null
-            and e.bureau_dept_id is not null
-            <if test="qy != null  and qy != ''">
-                and (i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
-                <if test="jd != null  and jd != ''">
-                    and (i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+            select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.remark,i.enterprise_address
+            from enforcement_registration e
+            left join sys_dept s on e.bureau_dept_id=s.dept_id
+            left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on e.enterprise_number=i.enterprise_number
+            <where>
+                and (e.enterprise_number not like "92440300MACQUM2M9C"
+                or e.enterprise_number is null)
+                and e.bureau_dept_name is not null
+                and e.law_enforcement_id is not null
+                and e.enterprise_name is not null
+                and e.enterprise_number is not null
+                and e.law_enforcer is not null
+                and e.law_enforcer_two is not null
+                and e.is_complaint is not null
+                and e.check_category is not null
+                and e.bureau_dept_id is not null
+                <if test="qy != null  and qy != ''">
+                    and (i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+                    <if test="jd != null  and jd != ''">
+                        and (i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
                 </if>
             </if>
             <if test="enterpriseName != null and enterpriseName != ''">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -146,8 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 and enforcement_time &lt;= #{params.endTime}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         order by enforcement_time desc
     </select>
@@ -262,6 +264,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="month != null and month != '' ">
                 AND DATE_FORMAT(r.create_time, '%m') = #{month}
             </if>
+            <!-- 数据范围过滤 -->
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         order by r.create_time desc
     </select>
@@ -341,7 +348,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and enforcement_time &lt;= #{params.endTime}
             </if>
             <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY  IFNULL(unite_check, RAND())
         order by enforcement_time desc
@@ -703,6 +713,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
             </if>
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         ORDER BY r.create_time DESC LIMIT 1000000000 ) t
         GROUP BY

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml

@@ -39,7 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
             <if test="updator != null  and updator != ''"> and updator = #{updator}</if>
             <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
             or dept_id is null
         </where>
     </select>
@@ -49,7 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
             <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
     </select>
     
@@ -69,8 +75,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             t1.id, t1.title, t1.`value`, t1.parent_id, t1.`desc`, t1.srot, t1.`status`, t1.`domain`, t1.dept, t1.dept_id, t1.demand, t1.basis, t1.creator, t1.create_time, t1.updator, t1.update_time
         from linkage_dict t1 LEFT JOIN linkage_dict t2 on t2.id = t1.parent_id
-        where t2.`value` = #{value}
-            ${params.dataScope}
+        <where>
+            and t2.`value` = #{value}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
+        </where>
     </select>
         
     <insert id="insertLinkageDict" parameterType="LinkageDict">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml

@@ -77,9 +77,13 @@
     <select id="statisticalLawEnforcer2" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
         SELECT er.law_enforcer, er.law_enforcer_id, count(1) AS total
         FROM enforcement_registration er
-        WHERE DATE_FORMAT( er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <where>
+            AND DATE_FORMAT( er.enforcement_time, '%Y%m' ) = DATE_FORMAT( CURDATE(), '%Y%m' )
+            <if test="params.dataScope != null and params.dataScope != ''">
+                ${params.dataScope}
+            </if>
+        </where>
+
         GROUP BY er.law_enforcer_id  order by total desc
     </select>
     <select id="statisticalEnterpriseType" parameterType="StatisticalVo" resultMap="StatisticalVoResult">
@@ -139,8 +143,10 @@
             <if test="industry!= null and industry!= ''">
                 AND ei.industry = #{industry}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY er.law_enforcement_id ORDER BY total DESC limit 100
     </select>
@@ -162,8 +168,10 @@
             <if test="industry!= null  and industry!= ''">
                 AND ei.industry = #{industry}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY er.law_enforcer_id  ORDER BY total DESC limit 100
     </select>
@@ -187,8 +195,10 @@
         <if test="industry!= null and industry!= '' ">
             AND ei.industry = #{industry}
         </if>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </if>
         GROUP BY d.id  ORDER BY total DESC limit 100
     </select>
 
@@ -209,8 +219,10 @@
             <if test="industry!= null and industry!= ''">
                 AND i.industry = #{industry}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY i.company_org_type ORDER BY total DESC limit 100
     </select>
@@ -233,8 +245,10 @@
             <if test="checkCategory != null and checkCategory != ''">
                 AND check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d') ORDER BY enforcement_time ASC
     </select>
@@ -256,8 +270,10 @@
             <if test="checkCategory != null and checkCategory != ''">
                 AND check_category = #{checkCategory}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY enterprise_number ORDER BY total desc
     </select>
@@ -277,8 +293,10 @@
             <if test="params.yearMonth != null and params.yearMonth != ''">
                 AND DATE_FORMAT(er.enforcement_time, '%Y-%m') = #{params.yearMonth}
             </if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="params.dataScope != null and params.dataScope != ''">
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
+            </if>
         </where>
         GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d'), er.enterprise_number ORDER BY total DESC limit 100
     </select>