日本企业列表

src/main/java/com/fdkankan/manage_jp/service/ICompanyService.java

@@ -1,6 +1,5 @@
 package com.fdkankan.manage_jp.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.manage_jp.common.PageInfo;
 import com.fdkankan.manage_jp.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -29,7 +28,7 @@ public interface ICompanyService extends IService<Company> {
 
     PageInfo<ResponseCompany> companyList(RequestCompany param);
 
-    JSONObject selectCompanyByType(RequestCompany param);
+    PageInfo selectCompanyByType(RequestCompany param);
 
     void saveSubUsers(RequestCompany bo);
 

src/main/java/com/fdkankan/manage_jp/service/impl/CompanyServiceImpl.java

@@ -6,16 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.SecurityUtil;
-import com.fdkankan.manage_jp.common.Constant;
 import com.fdkankan.manage_jp.common.PageInfo;
-import com.fdkankan.manage_jp.common.Result;
 import com.fdkankan.manage_jp.common.ResultCode;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.mapper.ICompanyMapper;
 import com.fdkankan.manage_jp.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage_jp.util.SendMailUtils;
 import com.fdkankan.manage_jp.vo.request.RequestCompany;
 import com.fdkankan.manage_jp.vo.response.ResponseCompany;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -28,7 +25,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -202,7 +198,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
     }
 
     @Override
-    public JSONObject selectCompanyByType(RequestCompany param) {
+    public PageInfo selectCompanyByType(RequestCompany param) {
         LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
         if(!StringUtils.isEmpty(param.getCompanyName())){
             wrapper.eq(Company::getCompanyName,param.getCompanyName());
@@ -217,7 +213,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
         if(!ObjectUtils.isEmpty(param.getUserName())){
             List<User> nameList = userService.findByUserNameList(param.getUserName());
             if(CollectionUtils.isEmpty(nameList)){
-                return new JSONObject();
+                return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
             }
             List<Long> companyIds = nameList.stream().map(User::getCompanyId).collect(Collectors.toList());
             wrapper.in(Company::getId,companyIds);
@@ -229,7 +225,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
         wrapper.orderByDesc(Company::getId);
         Page<Company> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
 
-        List<ResponseCompany> list = page.getRecords().stream().map(entity->{
+        for (Company entity : page.getRecords()) {
             ResponseCompany company = new ResponseCompany();
             BeanUtils.copyProperties(entity,company);
             if(entity.getManagerId() != null){
@@ -240,11 +236,8 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
                 }
             }
             company.setSceneNum(0);
-            return company;
-        }).collect(Collectors.toList());
-        JSONObject result = JSONObject.parseObject(JSONObject.toJSONString(param));
-        result.put("list",list);
-        return result;
+        }
+        return PageInfo.PageInfo(page);
     }
 
     @Override