feat(零碳): 长庆

1.系统管理模块,查询线路及组织机构树接口修改,增加查询逻辑,通过线路名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
2.系统管理模块,查询光伏电站及组织机构树接口修改,增加查询逻辑,通过电站名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java

@@ -54,10 +54,7 @@ import xstartup.feature.mybatis.helper.XMapperHelper;
 import xstartup.helper.XTransactionHelper;
 
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -283,14 +280,15 @@ public class BasePhotovoltaicPlantService {
     public XListResult<GetSysOrganizationAndPlantViewOutput> selectOuAndPhotovoltaicPlantInfoByParentOuId(XContext context, GetSysOrganizationAndPlantInput input) {
         SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
         BasePhotovoltaicPlantMapper plantMapper = context.getBean(BasePhotovoltaicPlantMapper.class);
-        QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         SysOrganizationView record = new SysOrganizationView();
         XCopyUtils.copyObject(input, record);
         record.setIsDeleted(SysOrganizationCode.NORMAL);
         PpsUserSession session = context.getSession(PpsUserSession.class);
         Integer isSuperAdmin = session.getIsSuperAdmin();
-        List<SysOrganizationView> viewList;
+        List<SysOrganizationView> viewList = new ArrayList<>(16);
         String ouId = "00000000-0000-0000-0000-000000000000";
+        String ouName = input.getOuName();
+        if (CharSequenceUtil.isBlank(ouName)) {
             if (XStringUtils.isEmpty(input.getParentOuId())) {
                 //如果是超级管理员查所以组织机构
                 if (UserConstant.ISSUPERADMIN_TRUE.equals(isSuperAdmin)) {
@@ -305,23 +303,21 @@ public class BasePhotovoltaicPlantService {
                 ouId = input.getParentOuId();
                 viewList = mapper.selectOuSonByParentOuId(record);
             }
-        String ouName = input.getOuName();
-        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
-                .orderByAsc(BasePhotovoltaicPlantEnt::getStationName);
+        }
         List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(new LambdaQueryWrapper<BasePhotovoltaicPlantEnt>()
-                .eq(CharSequenceUtil.isNotBlank(ouName), BasePhotovoltaicPlantEnt::getOuId, ouId)
+                .eq(CharSequenceUtil.isBlank(ouName), BasePhotovoltaicPlantEnt::getOuId, ouId)
                 .like(CharSequenceUtil.isNotBlank(ouName), BasePhotovoltaicPlantEnt::getStationName, ouName)
                 .eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
                 .orderByAsc(BasePhotovoltaicPlantEnt::getStationName)
         );
-        plantList.forEach(item -> {
+        for (BasePhotovoltaicPlantEnt item : plantList) {
             SysOrganizationView view = new SysOrganizationView();
             view.setId(item.getId());
             view.setOuName(item.getStationName());
             view.setShortName(item.getStationName());
             view.setOuLevel("PHOTOVOLTAIC");
             viewList.add(view);
-        });
+        }
         List<GetSysOrganizationAndPlantViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationAndPlantViewOutput.class);
         return XListResult.success(outputs);
     }