朱园亮 / xingyun-erp · Commits

Commit d46d30eb1f83a3090cff4876422f78a857fa6e98

Authored by 房远帅
1 parent f981ba50

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

Inline Side-by-side
Showing 8 changed files with 8 additions and 8 deletions
... ... @@ -351,7 +351,7 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
351 351 * 是否展示审核按钮(非持久化字段)
352 352 */
353 353 @TableField(exist = false)
354   - private Boolean showExamine;
  354 + private Boolean showExamine = false;
355 355
356 356 /**
357 357 * 流程发起人(非持久化字段)
... ...
... ... @@ -159,7 +159,7 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
159 159 * 是否展示审核按钮
160 160 */
161 161 @TableField(exist = false)
162   - private boolean showExamine;
  162 + private boolean showExamine = false;
163 163
164 164 /**
165 165 * 创建人ID
... ...
... ... @@ -223,7 +223,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
223 223 * 是否展示审核按钮(非持久化字段)
224 224 */
225 225 @TableField(exist = false)
226   - private Boolean showExamine;
  226 + private Boolean showExamine = false;
227 227
228 228 /**
229 229 * 订货单表物料行
... ...
... ... @@ -124,7 +124,7 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
124 124 * 是否展示审核字段（非持久化字段）
125 125 */
126 126 @TableField(exist = false)
127   - private boolean showExamine;
  127 + private boolean showExamine = false;
128 128
129 129 /**
130 130 * 创建人ID
... ...
... ... @@ -107,7 +107,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
107 107 // 获取当前人员的待办任务数据
108 108 List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
109 109 if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
110   - return new PageResult<>();
  110 + return PageResultUtil.convert(new PageInfo<>(datas));
111 111 }
112 112 List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
113 113 for (CustomerCredit customerCredit : datas) {
... ...
... ... @@ -66,7 +66,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
66 66 // 获取当前人员的待办任务数据
67 67 List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
68 68 if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
69   - return new PageResult<>();
  69 + return PageResultUtil.convert(new PageInfo<>(datas));
70 70 }
71 71 List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
72 72 for (PurchaseOrderInfo purchaseOrderInfo : datas) {
... ...
... ... @@ -67,7 +67,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
67 67 // 获取当前人员的待办任务数据
68 68 List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
69 69 if (CollectionUtils.isEmpty(flowTaskList)) {
70   - return new PageResult<>();
  70 + return PageResultUtil.convert(new PageInfo<>(datas));
71 71 }
72 72 List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
73 73 for (PurchaseOrderRevoke purchaseOrderRevoke : datas) {
... ...
... ... @@ -54,7 +54,7 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
54 54 // 获取当前人员的待办任务数据
55 55 List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
56 56 if (CollectionUtils.isEmpty(flowTaskList)) {
57   - return new PageResult<>();
  57 + return PageResultUtil.convert(new PageInfo<>(datas));
58 58 }
59 59 List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
60 60 for (DraftRequestCarTicket draftRequestCarTicket : datas) {
... ...