调整记录判空添加

pom.xml

@@ -165,6 +165,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
+            <version>1.4.2</version>
+        </dependency>
         <!--        <dependency>-->
         <!--            <groupId>com.alibaba.cloud</groupId>-->
         <!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
@@ -207,21 +212,21 @@
 
         <!--        </dependency>-->
         <!--skywalking traceId 记录到logback日志，请与安装的服务器版本对应-->
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
-            <version>8.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-logback-1.x</artifactId>
-            <version>8.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-opentracing</artifactId>
-            <version>8.7.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.skywalking</groupId>-->
+<!--            <artifactId>apm-toolkit-trace</artifactId>-->
+<!--            <version>8.7.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.skywalking</groupId>-->
+<!--            <artifactId>apm-toolkit-logback-1.x</artifactId>-->
+<!--            <version>8.7.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.skywalking</groupId>-->
+<!--            <artifactId>apm-toolkit-opentracing</artifactId>-->
+<!--            <version>8.7.0</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/kcim/dao/repository/QualificationApplyRepository.java

@@ -13,6 +13,7 @@ import lombok.val;
 import net.sf.jsqlparser.statement.select.GroupByElement;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.*;
@@ -224,7 +225,7 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
             //List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
             List<QualificationApplyAdjust> applyAdjustList = qualificationApplyAdjustMap.get(apply.getId());
 
-            if(applyAdjustList != null) {
+            if(!CollectionUtils.isEmpty(applyAdjustList)) {
                 //调整历史-调整人姓名
                 for(QualificationApplyAdjust adjust : applyAdjustList){
                     adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());

src/main/java/com/kcim/dao/repository/QualificationRepository.java

@@ -29,6 +29,11 @@ public class QualificationRepository extends ServiceImpl<QualificationMapper, Qu
         return  this.page(page,queryWrapper);
     }
 
+    public Page<Qualification> getPage(Integer current, Integer pageSize) {
+        Page<Qualification> page = new Page<>(current,pageSize);
+        return  this.page(page);
+    }
+
     public List<Qualification> list(){
         LambdaQueryWrapper<Qualification> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Qualification::getHospId, BaseUtil.getCurrentLoginHospId());

src/main/java/com/kcim/service/impl/QualificationManageServiceImpl.java

@@ -17,6 +17,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.*;
@@ -211,10 +212,11 @@ public class QualificationManageServiceImpl extends ServiceImpl<QualificationApp
             if(!StringUtils.isEmpty(userName) && !qualificationApply.getUserInfo().getName().contains(userName)){
                 continue;
             }
-
-            //调整历史-调整人姓名
-            for(QualificationApplyAdjust adjust : qualificationApply.getApplyAdjust()){
-                adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());
+            if(!CollectionUtils.isEmpty(qualificationApply.getApplyAdjust())){
+                //调整历史-调整人姓名
+                for(QualificationApplyAdjust adjust : qualificationApply.getApplyAdjust()){
+                    adjust.setAdjustUserName(empMap.get(adjust.getUserId()).getName());
+                }
             }
 
             Optional<QualificationManageForDoctor> returnItem = listReturn.stream().filter(q -> q.getUserInfo().getId().equals(qualificationApply.getUserId())).findFirst();

src/main/java/com/kcim/util/PageUtils.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -136,5 +137,37 @@ public class PageUtils implements Serializable {
 		this.totalAmount = totalAmount;
 	}
 
-
+	public static <T> List<T> getPageList(List<T> list,int current,int pageSize){
+		if(list ==null){
+			return new ArrayList<>();
+		}
+		if(list.size() == 0){
+			return  list;
+		}
+		if(current ==0){
+			current = 1;
+		}
+		//记录总数
+		int count = list.size();
+		//页数
+		int pageCount = 0;
+		if(count % pageSize==0){
+			pageCount = count / pageSize;
+		}else {
+			pageCount = count / pageSize + 1;
+		}
+		int fromIndex = 0;
+		int toIndex = 0;
+		if(current>pageCount){
+			return new ArrayList<>();
+		}
+		if(current != pageCount){
+			fromIndex = (current - 1)*pageSize;
+			toIndex = fromIndex + pageSize;
+		}else {
+			fromIndex = (current - 1)*pageSize;
+			toIndex = count;
+		}
+		return list.subList(fromIndex,toIndex);
+	}
 }