Merge remote-tracking branch 'origin/master'

xiejun

2023-10-19 8b73e9cbdf4035ef1aa1026c979222a7e4ca5e01

 Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/RoleMapper.xml

@@ -24,6 +24,14 @@
        select * from pl_org_role where is_deleted = 0
    </select>

    <select id="roleList" resultMap="roleResultMap">
        select * from pl_org_role
        WHERE is_deleted = 0
        <if test="_parameter!=null and _parameter!=''">
            and tenant_id = #{_parameter}
        </if>
    </select>

    <select id="tree" resultMap="treeNodeResultMap">
        select id, parent_id, role_name as title, id as "value", id as "key" from pl_org_role where is_deleted = 0
        <if test="param1!=null">