feat(能源管理系统): 测试问题修复

1.修改运维管理-组织机构管理模块,查询组织和线路列表接口sql查询逻辑,解决出现重复组织问题;
2.修改运维管理-组织机构管理模块,查询组织机构分页列表接口sql查询逻辑,解决出现重复组织问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationService.java

@@ -790,6 +790,17 @@ public class SysOrganizationService {
         return XPageResult.success(outputs, input, pageInfo.getTotal());
     }
 
+    /**
+     * 组织机构管理--分页列表
+     * POST /system/sys-organization/querySysOrganizationViewIncluedOwnerPage
+     * 接口ID：106663218
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-106663218
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XPageResult}<{@link QuerySysOrganizationViewOutput}>
+     */
+    @XApiAnonymous
     @XText("查询组织机构列表")
     @XApiPost
     public XPageResult<QuerySysOrganizationViewOutput> querySysOrganizationViewIncluedOwnerPage(XContext context, QuerySysOrganizationViewInput input) {

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -107,7 +107,8 @@
         sys_organization_rel sor
         LEFT JOIN sys_organization ou ON ou.id = sor.ou_id
         <where>
-            ou.is_deleted = #{isDeleted}
+            sor.end_time >= NOW()
+            and ou.is_deleted = #{isDeleted}
             <if test="id != null and id != ''">
                 and sor.parent_ou_id = #{id}
             </if>
@@ -471,7 +472,8 @@
         from sys_organization so
         left join sys_organization_rel sor on sor.parent_ou_id = so.id
         <where>
-            sor.ou_id in
+            sor.end_time >= NOW()
+            AND sor.ou_id in
             <foreach collection="list" open="(" close=")" separator="," item="item">
                 #{item}
             </foreach>