Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -30,8 +30,8 @@
    <select id="selectServiceCheckList" parameterType="com.smartor.domain.ServiceCheck"
            resultMap="ServiceCheckResult">
        <include refid="selectServiceCheckVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="deptCode != null  and deptCode != ''">
                and dept_code = #{deptCode}
            </if>
@@ -44,7 +44,6 @@
            <if test="orgid != null  and orgid != ''">
                and orgid = #{orgid}
            </if>
        </where>
    </select>

    <select id="selectServiceCheckById" parameterType="Long"