Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-11-29 704e7207d74b6477c5f472c5aba92d484ab17f98

 ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml

@@ -50,7 +50,7 @@
        FROM ums_depart ud
        WHERE is_deleted = 0
        <if test="departName!=null and departName!=''">
            and ud.name like CONCAT('%',#{departName},'%')
            and ud.depart_name like CONCAT('%',#{departName},'%')
        </if>
        ORDER BY ud.parent_id,ud.id desc
        LIMIT #{offset}, #{size}
@@ -94,4 +94,7 @@
        HAVING
            count( * )= 1
    </select>
    <select id="getDepartType" resultType="java.lang.String">
        select name from ums_data_dictionary where id = #{id}
    </select>
</mapper>