Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-06 7fd0771bbebafa36bc007ceb581cdaab4d290c82

 src/main/resources/mapper/SubjectMapper.xml

@@ -4,14 +4,14 @@
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Subject">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="level" jdbcType="INTEGER" property="level"/>
        <result column="level_name" jdbcType="VARCHAR" property="levelName"/>
        <result column="item_order" jdbcType="INTEGER" property="itemOrder"/>
        <result column="status" jdbcType="INTEGER" property="status"/>
        <result column="create_user" jdbcType="INTEGER" property="createUser"/>
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
        <result column="deleted" jdbcType="BIT" property="deleted"/>
    </resultMap>
    <sql id="Base_Column_List">
        id
        , name, level, level_name, item_order, deleted
        id, name, item_order, deleted, status, create_user, create_time
    </sql>


@@ -34,12 +34,12 @@
        <include refid="Base_Column_List"/>
        FROM t_subject
        <where>
            and deleted=0
            <if test="id != null ">
                and id= #{id}
            and deleted = 0
            <if test="status != null">
                and status = #{status}
            </if>
            <if test="level != null ">
                and level= #{level}
            <if test="name != null and name != ''">
                and instr(name, #{name})
            </if>
        </where>
    </select>