修改查询当前登陆人所在单位下的所有焊工接口

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -57,7 +57,7 @@ public class WelderController extends BaseController {
         LambdaQueryWrapper<Project> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(Project::getCode,code);
         Project project = projectMapper.selectOne(wrapper);
-        List<Map> info = orgService.getInfo(String.valueOf(project.getCompanyId()));
+        List<Map> info = orgService.getInfo(String.valueOf(project.getCompanyId()),null).getRecords();
         for (Map<String,Object> map:info){
             JSONObject jsonObject=new JSONObject();
             jsonObject.put("name",map.get("name"));

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
@@ -165,21 +166,28 @@ public class OrgServiceImpl {
      * @param companyId 单位/企业id
      * @return
      */
-    public List<Map> getInfo(String companyId){
+    public IPage getInfo(String companyId,IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr :: getSequenceNbr ,companyId);
         OrgUsr orgUsrCompany = orgUsrServiceImpl.getOne(wrapper);
 
         LambdaQueryWrapper<OrgUsr> welderWrapper = new LambdaQueryWrapper<>();
         welderWrapper.likeRight(OrgUsr :: getBizOrgCode,orgUsrCompany.getBizOrgCode()).eq(OrgUsr :: getOrgExpandAttr1, OrgEnum.焊工.getKey());
-        List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(welderWrapper);
+        List<OrgUsr> orgUsrList = new ArrayList<>();
+        if(ValidationUtil.isEmpty(page)){
+            orgUsrList = orgUsrServiceImpl.list(welderWrapper);
+            page = new Page();
+        }else{
+            orgUsrList = orgUsrServiceImpl.page(page,welderWrapper).getRecords();
+        }
 
         List<Map> mapList = new ArrayList<>();
         for (OrgUsr orgUsr : orgUsrList) {
             Map map = getdetialInfo(String.valueOf(orgUsr.getSequenceNbr()));
             mapList.add(map);
         }
-        return mapList;
+        page.setRecords(mapList);
+        return page;
     }
 
     /**
@@ -203,10 +211,10 @@ public class OrgServiceImpl {
      * 获取当前登陆人所在公司/单位/企业 下的 所有焊工人员
      * @return
      */
-    public List<Map> getCompanyWelder(){
+    public IPage getCompanyWelder(IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
-        return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
+        return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
     }
 
     /**