Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -84,8 +84,8 @@
    <select id="selectBaseOrganizationList" parameterType="com.smartor.domain.BaseOrganization"
            resultMap="BaseOrganizationResult">
        <include refid="selectBaseOrganizationVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="OrganizationName != null  and OrganizationName != ''">
                and OrganizationName like concat('%', #{OrganizationName}, '%')
            </if>
@@ -173,7 +173,6 @@
            <if test="orgid != null ">
                and orgid = #{orgid}
            </if>
        </where>
    </select>

    <select id="selectBaseOrganizationByID" parameterType="Long"