楚江ERP：客户资信-bug修复

@@ -351,7 +351,7 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
-    private Boolean showExamine;
+    private Boolean showExamine = false;
 
 
     /**
     /**
      * 流程发起人(非持久化字段)
      * 流程发起人(非持久化字段)

@@ -159,7 +159,7 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
      * 是否展示审核按钮
      * 是否展示审核按钮
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
-    private boolean showExamine;
+    private boolean showExamine = false;
 
 
     /**
     /**
      * 创建人ID
      * 创建人ID

@@ -223,7 +223,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
-    private Boolean showExamine;
+    private Boolean showExamine = false;
 
 
     /**
     /**
      * 订货单表物料行
      * 订货单表物料行

@@ -124,7 +124,7 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
      * 是否展示审核字段（非持久化字段）
      * 是否展示审核字段（非持久化字段）
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
-    private boolean showExamine;
+    private boolean showExamine = false;
 
 
     /**
     /**
      * 创建人ID
      * 创建人ID

@@ -107,7 +107,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
-                return new PageResult<>();
+                return PageResultUtil.convert(new PageInfo<>(datas));
             }
             }
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             for (CustomerCredit customerCredit : datas) {
             for (CustomerCredit customerCredit : datas) {

@@ -66,7 +66,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
             if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
-                return new PageResult<>();
+                return PageResultUtil.convert(new PageInfo<>(datas));
             }
             }
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             for (PurchaseOrderInfo purchaseOrderInfo : datas) {
             for (PurchaseOrderInfo purchaseOrderInfo : datas) {

@@ -67,7 +67,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (CollectionUtils.isEmpty(flowTaskList)) {
             if (CollectionUtils.isEmpty(flowTaskList)) {
-                return new PageResult<>();
+                return PageResultUtil.convert(new PageInfo<>(datas));
             }
             }
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             for (PurchaseOrderRevoke purchaseOrderRevoke : datas) {
             for (PurchaseOrderRevoke purchaseOrderRevoke : datas) {

@@ -54,7 +54,7 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (CollectionUtils.isEmpty(flowTaskList)) {
             if (CollectionUtils.isEmpty(flowTaskList)) {
-                return new PageResult<>();
+                return PageResultUtil.convert(new PageInfo<>(datas));
             }
             }
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             for (DraftRequestCarTicket draftRequestCarTicket : datas) {
             for (DraftRequestCarTicket draftRequestCarTicket : datas) {