BUg修复

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyPersonServiceImpl.java

@@ -43,7 +43,7 @@ public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompan
 
     @Override
     public CommonPage<BaseCompanyPerson> baseCompanyPersonList(String companyCode, String companyName, Integer pageNum, Integer pageSize) {
-        IPage<BaseCompany> page1 = new Page<>(pageNum, pageSize);
+//        IPage<BaseCompany> page1 = new Page<>(pageNum, pageSize);
         IPage<BaseCompanyPerson> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<BaseCompany> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.select(BaseCompany::getCompanyId)
@@ -51,11 +51,11 @@ public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompan
                 .like(StringUtils.isNotBlank(companyCode), BaseCompany::getCompanyCode, companyCode)
                 .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
                 .orderByDesc(BaseCompany::getId);
-        page1 = baseCompanyMapper.selectPage(page1, queryWrapper1);
-        if (CollectionUtils.isNotEmpty(page1.getRecords())){
+        List<BaseCompany> baseCompanies = baseCompanyMapper.selectList(queryWrapper1);
+        if (CollectionUtils.isNotEmpty(baseCompanies)){
             List<String> companyIdList = new ArrayList<>();
-            for (int i = 0; i < page1.getRecords().size(); i++) {
-                companyIdList.add(page1.getRecords().get(i).getCompanyId());
+            for (int i = 0; i < baseCompanies.size(); i++) {
+                companyIdList.add(baseCompanies.get(i).getCompanyId());
             }
             LambdaQueryWrapper<BaseCompanyPerson> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.in(BaseCompanyPerson::getCompanyId, companyIdList)