Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -40,8 +40,8 @@
    <select id="selectServiceTaskdeptList" parameterType="com.smartor.domain.ServiceTaskdept"
            resultMap="ServiceTaskdeptResult">
        <include refid="selectServiceTaskdeptVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="taskId != null ">
                and task_id = #{taskId}
            </if>
@@ -69,7 +69,6 @@
            <if test="orgid != null  and orgid != ''">
                and orgid = #{orgid}
            </if>
        </where>
    </select>

    <select id="selectServiceTaskdeptById" parameterType="Long"
@@ -172,10 +171,12 @@
            <if test="orgid != null">orgid = #{orgid},
            </if>
        </trim>
        <where>
        where 1=1
        <if test="id != null">and id = #{id}</if>
        <if test="taskId != null">and task_id = #{taskId}</if>
        </where>
        <if test="orgid != null and orgid != ''">
            AND orgid = #{orgid}
        </if>
    </update>

    <update id="deleteServiceTaskdeptById" parameterType="Long">
@@ -192,10 +193,12 @@
            del_flag =1,
            update_time = sysdate()
        </trim>
        <where>
        where 1=1
            <if test="id != null">and id = #{id}</if>
            <if test="taskId != null">and task_id = #{taskId}</if>
        </where>
            <if test="orgid != null and orgid != ''">
                AND orgid = #{orgid}
            </if>
    </update>

    <update id="deleteServiceTaskdeptByIds" parameterType="String">