Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-04-26 fc223b26f87f7a221b38084bb62d8047974bbf1c

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

@@ -11,12 +11,12 @@
    <sql id="where">
        <where>
            <!--查询条件自行添加-->
            p.is_del=0
            is_del=0
            <if test="p.id != null and p.id !=''">
                and id = #{p.id}
            </if>
            <if test="p.proName != null and p.proName !=''">
                and pro_name = #{p.proName}
                and pro_name like concat('%', #{p.proName}, '%')
            </if>
            <if test="p.proTime != null and p.proTime !=''">
                and pro_time = #{p.proTime}
@@ -57,6 +57,7 @@
            <if test="p.updateTime != null and p.updateTime !=''">
                and update_time = #{p.updateTime}
            </if>
            <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>
        </where>
    </sql>

@@ -67,6 +68,7 @@
        from sys_product
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysProduct当作查询条件返回对象集合-->