diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 09c93b3c..a41a66c2 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -128,7 +128,7 @@ public class OrderDetailController extends BaseController {
 
         List<FinancialMaster> financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds);
         Map<Long, FinancialMaster> financialMasterMap = new HashMap<>();
-        if(0 == orderDetail.getSysPayStatus()){
+        if(orderDetail.getSysPayStatus() != null && 0 == orderDetail.getSysPayStatus()){
             financialMasterMap = financialMasters
                     .stream().filter(financialMaster->0 == financialMaster.getPayStatus()).collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y));
         }else {
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
index d5b4cfa7..f5f51ddd 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
@@ -24,6 +24,7 @@ import com.ghy.worker.domain.WorkerArea;
 import com.ghy.worker.domain.WorkerBank;
 import com.ghy.worker.domain.WorkerGoodsCategory;
 import com.ghy.worker.service.*;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.util.Assert;
@@ -154,6 +155,7 @@ public class WorkerController extends BaseController {
                 worker.setDeptId(this.getSysUser().getDept().getParentId());
             }
             List<Worker> list = workerService.getWorkList(worker);
+            TableDataInfo dataTable = getDataTable(list);
             list.forEach(w -> {
                 Goods goods = new Goods();
                 goods.setWorkerId(w.getWorkerId());
@@ -164,13 +166,18 @@ public class WorkerController extends BaseController {
                 workerListResponse.setGoodsCategories(workerGoodsCategoryService.getByWorker(w.getWorkerId()));
                 workerListResponse.setSpecialSkills(specialSkillService.getByWorker(w.getWorkerId()));
                 resList.add(workerListResponse);
+
             });
+            TableDataInfo rspData = new TableDataInfo();
+            rspData.setCode(0);
+            rspData.setRows(resList);
+            rspData.setTotal(dataTable.getTotal());
+            return rspData;
         } catch (Exception e) {
             e.printStackTrace();
             logger.error(ExceptionUtil.getExceptionMessage(e));
+            return getDataTable(new ArrayList<>());
         }
-
-        return getDataTable(resList);
     }
 
     @PostMapping("/app/list")