Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml

@@ -115,24 +115,18 @@
    <!--查询指定行数据-->
    <select id="selectJoinPage" resultMap="CodeReferconfigMap">
        SELECT
            PCR.*
        PCR.*
        FROM PL_CODE_REFERCONFIG PCR
        <where>
            <if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
                PCR.TENANTID = #{codeReferConfig.tenantId}
            </if>
<<<<<<< Updated upstream
            <if test="codeReferConfig.isOpenGlobal != null and codeReferConfig.isOpenGlobal != ''">
                OR PCR.ISOPENGLOBAL = #{codeReferConfig.isOpenGlobal}
            </if>
            <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
                and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
            </if>
=======
            <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
                and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
            </if>
>>>>>>> Stashed changes
            <if test="codeReferConfig.id != null and codeReferConfig.id != ''">
                and ID like CONCAT(CONCAT('%', #{codeReferConfig.id}), '%')
            </if>
@@ -141,37 +135,33 @@

    <select id="selectShowFieldByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
        SELECT temp.* FROM (
            SELECT
                PCS.REFERCONFIGOID,
                PCS.FIELD,
                PCS.TITLE,
                PCS.FIELDTYPE,
                PCS.SORT,
                PCS.ATTRSORTFIELD,
                PCS.WIDTH,
                PCS.FIXEDPOSITION,
<<<<<<< Updated upstream
                PCS.TEMPLET,
                PCS.ISQUERY
=======
                PCS.TEMPLET
>>>>>>> Stashed changes
            FROM PL_CODE_REFERCONFIG PCR
                LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
            temp WHERE temp.REFERCONFIGOID = #{oid}
                               SELECT
                                   PCS.REFERCONFIGOID,
                                   PCS.FIELD,
                                   PCS.TITLE,
                                   PCS.FIELDTYPE,
                                   PCS.SORT,
                                   PCS.ATTRSORTFIELD,
                                   PCS.WIDTH,
                                   PCS.FIXEDPOSITION,
                                   PCS.TEMPLET,
                                   PCS.ISQUERY
                               FROM PL_CODE_REFERCONFIG PCR
                                        LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
                               temp WHERE temp.REFERCONFIGOID = #{oid}
    </select>

    <select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
        SELECT temp.*
            FROM
        FROM
            (SELECT
                PCSR.FILTERFIELD,
                PCSR.FILTERTYPE,
                PCSR.FILTERVALUE,
                PCSR.REFERCONFIGOID
            FROM PL_CODE_REFERCONFIG PCR
                     LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
            temp WHERE temp.REFERCONFIGOID = #{oid}
                 PCSR.FILTERFIELD,
                 PCSR.FILTERTYPE,
                 PCSR.FILTERVALUE,
                 PCSR.REFERCONFIGOID
             FROM PL_CODE_REFERCONFIG PCR
                      LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
                temp WHERE temp.REFERCONFIGOID = #{oid}
    </select>

</mapper>