|
@@ -713,14 +713,17 @@ public class OrderBaseLogic {
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(orderWorkerList)) {
|
|
|
for (PgOrderWorker orderWorker : orderWorkerList) {
|
|
|
- WorkerTeamBean bean = new WorkerTeamBean();
|
|
|
- bean.setWorkerId(orderWorker.getWorkerId());
|
|
|
- bean.setWorkerName(orderWorker.getWorkerName());
|
|
|
- bean.setWorkerNumber(orderWorker.getWorkerNumber());
|
|
|
- bean.setWorkerMobile(orderWorker.getWorkerMobile());
|
|
|
- bean.setWorkerIdCard(orderWorker.getWorkerIdcard());
|
|
|
- bean.setIsSelect(true);
|
|
|
- workerTeamMap.put(orderWorker.getWorkerId(), bean);
|
|
|
+ if (StringUtils.isNotBlank(orderWorker.getWorkerId()) && StringUtils.isNotBlank(orderWorker.getWorkerIdcard())) {
|
|
|
+ WorkerTeamBean bean = new WorkerTeamBean();
|
|
|
+ bean.setWorkerId(orderWorker.getWorkerId());
|
|
|
+ bean.setWorkerName(orderWorker.getWorkerName());
|
|
|
+ bean.setWorkerNumber(orderWorker.getWorkerNumber());
|
|
|
+ bean.setWorkerMobile(orderWorker.getWorkerMobile());
|
|
|
+ bean.setWorkerIdCard(orderWorker.getWorkerIdcard());
|
|
|
+ bean.setIsSelect(true);
|
|
|
+
|
|
|
+ workerTeamMap.put(orderWorker.getWorkerId(), bean);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|