Merge remote-tracking branch 'origin/dev' into dev

克 刘

2020-04-02 81aaee286ba7f54ef1b713fedd6d24a9294745df

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!---->
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysLoggerMapper">
<mapper namespace="com.kidgrow.usercenter.mapper.SysLoggerMapper">
    <!--定义查询列-->
    <sql id="Column_List">
      *
@@ -11,36 +11,36 @@
    <sql id="where">
        <where>
            <!--查询条件自行添加-->
            is_del=0
                                                            <if test="applicationName != null and applicationName !=''">
                and  application_name =  #{applicationName}
            p.is_del=0
                                                            <if test="p.applicationName != null and p.applicationName !=''">
                and  application_name =  #{p.applicationName}
            </if>
                                                <if test="className != null and className !=''">
                and  class_name =  #{className}
                                                <if test="p.className != null and p.className !=''">
                and  class_name =  #{p.className}
            </if>
                                                <if test="methodName != null and methodName !=''">
                and  method_name =  #{methodName}
                                                <if test="p.methodName != null and p.methodName !=''">
                and  method_name =  #{p.methodName}
            </if>
                                                <if test="userId != null and userId !=''">
                and  user_id =  #{userId}
                                                <if test="p.userId != null and p.userId !=''">
                and  user_id =  #{p.userId}
            </if>
                                                <if test="userName != null and userName !=''">
                and  user_name =  #{userName}
                                                <if test="p.userName != null and p.userName !=''">
                and  user_name =  #{p.userName}
            </if>
                                                <if test="clientId != null and clientId !=''">
                and  client_id =  #{clientId}
                                                <if test="p.clientId != null and p.clientId !=''">
                and  client_id =  #{p.clientId}
            </if>
                                                <if test="operation != null and operation !=''">
                and  operation =  #{operation}
                                                <if test="p.operation != null and p.operation !=''">
                and  operation =  #{p.operation}
            </if>
                                                <if test="timestamp != null and timestamp !=''">
                and  timestamp =  #{timestamp}
                                                <if test="p.timestamp != null and p.timestamp !=''">
                and  timestamp =  #{p.timestamp}
            </if>
                                </where>
    </sql>

    <!--定义根据-SysLogger当作查询条件返回对象-->
    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.SysLogger">
    <select id="findByObject"  resultType="com.kidgrow.usercenter.model.SysLogger">
        select <include refid="Column_List"/>
        from sys_logger
        <include refid="where"/>
@@ -48,7 +48,7 @@
    </select>

    <!--定义根据-SysLogger当作查询条件返回对象集合-->
    <select id="findList" resultType="com.kidgrow.oprationcenter.model.SysLogger">
    <select id="findList" resultType="com.kidgrow.usercenter.model.SysLogger">
        select <include refid="Column_List"/>
        from sys_logger
        order by id desc