修复项目列表空指针bug

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/PmProjectController.java

@@ -44,7 +44,7 @@ public class PmProjectController {
     public ApiResult<CommonPage<PmProject>> pageList(@RequestParam(value = "projectName", required = false, defaultValue = "") String projectName,
                                                      @RequestParam(value = "projectType", required = false, defaultValue = "0") Integer projectType,
                                                      @RequestParam(value = "projectStatus", required = false, defaultValue = "0") Integer projectStatus,
-                                                     @RequestParam(value = "projectAscription", required = false) Integer projectAscription,
+                                                     @RequestParam(value = "projectAscription", required = false, defaultValue = "0") Integer projectAscription,
                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
         return ApiResult.success(pmProjectService.projectList(projectName, projectType, projectStatus, projectAscription, pageNum, pageSize));

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmProjectServiceImpl.java

@@ -12,6 +12,8 @@ import com.usky.iot.service.PmProjectService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -101,8 +103,8 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
             lambdaQuery.eq(PmProject::getProjectStatus, projectStatus);
         }
         page = this.page(page, lambdaQuery);
-        if (page.getRecords() == null && page.getRecords().isEmpty()) {
-            return null;
+        if (page.getRecords() == null || page.getRecords().isEmpty()) {
+            return new CommonPage<>(Collections.emptyList(), 0, pageSize, pageNum);
         }
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }