Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -123,7 +124,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<OrgUsr> selectPersonListByCompanyIdList(@Param("companyIdList") List<String> companyIdList);
 
-    List<OrgUsr> getWelderByProjectId(@Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
+    Page<OrgUsr> getWelderByProjectId(@Param("page") Page<OrgUsr> page, @Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
 
-    List<OrgUsr> getAllListByProjectId(@Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
+    Page<OrgUsr> getAllListByProjectId(@Param("page") Page<OrgUsr> page, @Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2478,12 +2478,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
 	}
 
-	public List<OrgUsr>	getWelderByProjectId(String projectId, Long companyId, String name) {
-		return this.baseMapper.getWelderByProjectId(projectId, companyId, name);
+	public Page<OrgUsr> getWelderByProjectId(Page<OrgUsr> page, String projectId, Long companyId, String name) {
+		return this.baseMapper.getWelderByProjectId(page, projectId, companyId, name);
 	}
 
-	public List<OrgUsr>	getAllListByProjectId(String projectId, Long companyId, String name) {
-		return this.baseMapper.getAllListByProjectId(projectId, companyId, name);
+	public Page<OrgUsr> getAllListByProjectId(Page<OrgUsr> page, String projectId, Long companyId, String name) {
+		return this.baseMapper.getAllListByProjectId(page, projectId, companyId, name);
 	}
 
 }
\ No newline at end of file

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

@@ -224,18 +224,17 @@ public class WelderServiceImpl {
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
         ReginParams reginParams = orgService.getReginParams();
         Long companySequenceNbr = reginParams.getBusinessInfo().getCompanySequenceNbr();
-        List<OrgUsr> usrList;
+        Page<OrgUsr> page = new Page<>(current, size);
         if (!ObjectUtils.isEmpty(type) && "all".equals(type)) {
-            usrList = orgUsrService.getAllListByProjectId(projectId, companySequenceNbr, name);
+            page = orgUsrService.getAllListByProjectId(page, projectId, companySequenceNbr, name);
         } else {
-            usrList = orgUsrService.getWelderByProjectId(projectId, companySequenceNbr, name);
+            page = orgUsrService.getWelderByProjectId(page, projectId, companySequenceNbr, name);
         }
-        mapPage.setTotal(usrList.size());
-        List<OrgUsr> collect = usrList.stream()
-                .skip((long) (current - 1) * size)
-                .limit(size)
-                .collect(Collectors.toList());
-        collect.forEach(item -> {
+        List<OrgUsr> usrList = page.getRecords();
+        mapPage.setTotal(page.getTotal());
+        mapPage.setSize(page.getSize());
+        mapPage.setPages(page.getPages());
+        usrList.forEach(item -> {
             HashMap<String, Object> map = new HashMap<>();
             map.put("sequenceNbr", item.getSequenceNbr());
             List<Map<String, Object>> message = alertFormValueServiceImpl.getMessageMapByInstanceId(String.valueOf(item.getSequenceNbr()));