Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml

@@ -38,8 +38,8 @@
    <select id="selectTemplateDeptList" parameterType="com.smartor.domain.TemplateDept"
            resultMap="TemplateDeptResult">
        <include refid="selectTemplateDeptVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="type != null ">
                and type = #{type}
            </if>
@@ -61,7 +61,6 @@
            <if test="longTemp != null  and longTemp != ''">
                and long_temp = #{longTemp}
            </if>
        </where>
    </select>

    <select id="selectTemplateDeptById" parameterType="Long"