WMS拣货单管理拣货修改

2026-02-26 14:39:59 +08:00
parent 83470dbf64
commit 33575a102c
3 changed files with 52 additions and 6 deletions
@@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        from contract_manage
        where
            del_flag = 1
-        order by create_time desc
    </sql>

    <sql id="selectContractManagePo1">
@@ -116,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            resultType="com.mhd.basic.domain.contractManage.repository.po.ContractManagePO">
        <include refid="selectContractManagePo"/>
        <include refid="common_where"/>
+        order by create_time desc
    </select>


@@ -145,7 +145,14 @@


    <sql id="common_where_two">
-        <if test="expenseAccountDO.topOrganizationId != null ">
+        <!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
+        <!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） -->
+        <if test="expenseAccountDO.organizationId != null">
+            <!-- 如果设置了 organizationId，添加 organization_id 条件 -->
+            and organization_id = #{expenseAccountDO.organizationId}
+        </if>
+        <if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null">
+            <!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
            and top_organization_id = #{expenseAccountDO.topOrganizationId}
        </if>
    </sql>