From ddcabaa6fbce343fd0d80f5ab5947fb892ebafcb Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 13 May 2020 18:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=98=E5=AE=9DIP=E6=8E=A5=E5=8F=A3=E4=B8=8D?=
=?UTF-8?q?=E7=A8=B3=E5=AE=9A=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi/src/main/resources/application.yml | 2 +-
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index 34b1f43..8de79e7 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -11,7 +11,7 @@ ruoyi:
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath
# 获取ip地址开关
- addressEnabled: true
+ addressEnabled: false
# 开发环境配置
server:
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
index 220572d..c546dee 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from sys_dept where find_in_set(#{deptId}, ancestors)
</select>
- <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="java.lang.Integer">
+ <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
</select>