diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java
index 731c4a4..80c02bb 100644
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java
@@ -52,6 +52,9 @@ public interface IPersonnelService {
     List<SysUser> findSysUserByIds(Long[] ids);
 
     @ApiOperation(value = "查询账号信息")
+    ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager);
+
+    @ApiOperation(value = "查询账号信息")
     List<SysUser> querySysUserByUserDetailModelOrIds(UserDetailModel model, List<Long> ids);
 
     @ApiOperation(value = "查询账号信息")
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
index 10cbde7..059850a 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
@@ -574,7 +574,7 @@ public class PersonnelController extends CoreBaseController {
      * @param model 查询条件
      * @return 处理结果
      */
-    @PostMapping(value = "/pager/get-user-list")
+    @PostMapping(value = "/pager/get-user-info-list")
     @ApiOperation(value = "根据条件分页查询用户信息", notes = "根据条件分页查询用户信息")
     public ResultBean queryPagerByUserInfo(@RequestBody UserDetailPagerModel model) {
         try {
@@ -588,6 +588,24 @@ public class PersonnelController extends CoreBaseController {
     }
 
     /**
+     * 根据条件分页查询用户信息
+     * @param model 查询条件
+     * @return 处理结果
+     */
+    @PostMapping(value = "/pager/get-user-list")
+    @ApiOperation(value = "根据条件分页查询账号信息", notes = "根据条件分页查询账号信息")
+    public ResultBean queryPagerByUser(@RequestBody UserDetailPagerModel model) {
+        try {
+            ListPager<SysUser> listPager = personnelService.querySysUser(model.getUserDetailModel(), model.getPager());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    /**
      * 获取账号的所有组织信息集合
      * @return 组织信息集合
      */
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
index 7224dc3..527a37b 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
@@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.*;
@@ -161,6 +162,13 @@ public class PersonnelServiceService implements IPersonnelService {
     }
 
     @Override
+    public ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager) {
+        DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUser(model.getSysUser(), StringTool.getListLong(model.getUserIdList()));
+        pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(packBean));
+        return new ListPager<>(userRDao.findByHqlWherePage(packBean, pager), pager);
+    }
+
+    @Override
     public List<SysUser> querySysUserByUserDetailModelOrIds(UserDetailModel model, List<Long> ids) {
         LOGGER.info("平台用户 SysUser model:{} ids:{}", model, ids);
         String modeWhere = HqlModelPack.packHqlSysUserByModelOrIds(model, ids);
@@ -209,8 +217,10 @@ public class PersonnelServiceService implements IPersonnelService {
 
     @Override
     public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) {
-        pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo())));
-        return new ListPager<>(userInfoRDao.findByHqlWherePage(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo()), pager), pager);
+        DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUserInfo(model.getSysUserInfo(), StringTool.getListLong(model.getUserInfoIdList()));
+
+        pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(packBean));
+        return new ListPager<>(userInfoRDao.findByHqlWherePage(packBean, pager), pager);
     }
 
     @Override
diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml
index 0207493..255404f 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml
+++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml
@@ -1,67 +1,101 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration status="WARN">
-    <!--全局参数-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
     <Properties>
         <Property name="log4j2.level" value="INFO"/>
-        <Property name="logoSystemFilePath" value="../logs/${project.name}-system"/>
-        <Property name="logoInfoFilePath" value="../logs/${project.name}-info"/>
-        <Property name="logoErrorFilePath" value="../logs/${project.name}-error"/>
-        <Property name="logoConsoleFilePath" value="../logs/${project.name}-console"/>
+        <!-- 日志存放位置 -->
+        <Property name="logFileRootPath" value="../logs"/>
+
+        <!-- 日志输出格式 -->
         <Property name="pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n</Property>
         <Property name="info_pattern">[%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n</Property>
         <Property name="system_log_pattern">[SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n</Property>
     </Properties>
-    <Loggers>
-        <Root level="${log4j2.level}">
-            <AppenderRef ref="console"></AppenderRef>
-            <AppenderRef ref="rolling_file"></AppenderRef>
-            <AppenderRef ref="error_file"></AppenderRef>
-            <AppenderRef ref="console_file"></AppenderRef>
-        </Root>
-        <!--系统提示信息-->
-        <Logger name="system_log" level="${log4j2.level}" additivity="false">
-            <AppenderRef ref="system_log_console"></AppenderRef>
-        </Logger>
-    </Loggers>
-    <Appenders>
-        <Console name="console" target="SYSTEM_OUT" follow="true">
-            <!--控制台只输出level及以上级别的信息-->
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout>
-                <Pattern>${info_pattern}</Pattern>
-            </PatternLayout>
-        </Console>
 
-        <File name="console_file"
-              fileName="${logoConsoleFilePath}.log" >
-            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT" follow="true">
+            <!--输出日志的格式-->
             <PatternLayout>
                 <Pattern>${info_pattern}</Pattern>
             </PatternLayout>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${logFileRootPath}/${project.name}.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss-SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="1024 MB"/>
+            </Policies>
         </File>
 
-        <File name="system_log_console" fileName="${logoSystemFilePath}.log">
+        <File name="system_log_console"  fileName="${logFileRootPath}/${project.name}-system.log"
+              filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-system-%i.log">
             <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
                 <Pattern>${system_log_pattern}</Pattern>
             </PatternLayout>
         </File>
 
-        <RollingFile name="rolling_file" fileName="${logoInfoFilePath}.log">
-            <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${logFileRootPath}/${project.name}-info.log"
+                     filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-info-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
                 <Pattern>${pattern}</Pattern>
             </PatternLayout>
             <Policies>
-                <TimeBasedTriggeringPolicy interval="1"/>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="1024 MB"/>
             </Policies>
+            <DefaultRolloverStrategy max="3"/>
         </RollingFile>
-
-        <File name="error_file" fileName="${logoErrorFilePath}.log">
+        <RollingFile name="RollingFileWarn" fileName="${logFileRootPath}/${project.name}-warn.log"
+                     filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-warn-%i.log">
             <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
                 <Pattern>${pattern}</Pattern>
             </PatternLayout>
-        </File>
-    </Appenders>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="1024 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="3"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${logFileRootPath}/${project.name}-error.log"
+                     filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-error-%i.log">
+            <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout>
+                <Pattern>${pattern}</Pattern>
+            </PatternLayout>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="1024 MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="3"/>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <!--        <logger name="org.springframework" level="INFO"></logger>-->
+        <!--        <logger name="org.mybatis" level="INFO"></logger>-->
+        <root level="${log4j2.level}">
+            <appender-ref ref="log"/>
+            <appender-ref ref="Console"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </root>
+
+        <!--系统提示信息-->
+        <Logger name="system_log" level="${log4j2.level}" additivity="false">
+            <AppenderRef ref="system_log_console"></AppenderRef>
+        </Logger>
+    </loggers>
 </configuration>
\ No newline at end of file