2023年2月2 15:33

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -853,7 +853,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			//客户
 			if (!ObjectUtil.isEmpty(record.getCorpId())) {
 				if (ObjectUtil.isNotEmpty(corpsDescList)) {
-					CorpsDesc corpsDesc = fleetList.stream().anyMatch(e -> e.getId().equals(record.getCorpId())) ? fleetList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get() : null;
+					CorpsDesc corpsDesc = corpsDescList.stream().anyMatch(e -> e.getId().equals(record.getCorpId())) ? corpsDescList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get() : null;
 					if (ObjectUtils.isNotNull(corpsDesc)) {
 						record.setCreateUserName(corpsDesc.getCname());
 						record.setCorpShortName(corpsDesc.getShortName());
@@ -863,7 +863,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			//创建人
 			if (!ObjectUtil.isEmpty(record.getCreateUser())) {
 				if (ObjectUtil.isNotEmpty(createUserList)) {
-					User user = dispatcherList.stream().anyMatch(e -> e.getId().equals(record.getCreateUser())) ? dispatcherList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().get() : null;
+					User user = createUserList.stream().anyMatch(e -> e.getId().equals(record.getCreateUser())) ? createUserList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().get() : null;
 					if (ObjectUtils.isNotNull(user)) {
 						record.setCreateUserName(user.getRealName());
 					}
@@ -872,7 +872,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			//业务员
 			if (!ObjectUtil.isEmpty(record.getSalesman())) {
 				if (ObjectUtil.isNotEmpty(salesmanList)) {
-					User user = dispatcherList.stream().anyMatch(e -> e.getId().equals(record.getSalesman())) ? dispatcherList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().get() : null;
+					User user = salesmanList.stream().anyMatch(e -> e.getId().equals(record.getSalesman())) ? salesmanList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().get() : null;
 					if (ObjectUtils.isNotNull(user)) {
 						record.setSalesmanName(user.getRealName());
 					}
@@ -890,9 +890,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			//调度部门
 			if (!ObjectUtil.isEmpty(record.getDispatchDept())) {
 				if (ObjectUtil.isNotEmpty(dispatchDeptList)) {
-					User user = dispatcherList.stream().anyMatch(e -> e.getId().equals(record.getDispatchDept())) ? dispatcherList.stream().filter(e -> e.getId().equals(record.getDispatchDept())).findFirst().get() : null;
-					if (ObjectUtils.isNotNull(user)) {
-						record.setDispatchDeptName(user.getRealName());
+					Dept dept = dispatchDeptList.getData().stream().anyMatch(e -> e.getId().equals(record.getDispatchDept())) ? dispatchDeptList.getData().stream().filter(e -> e.getId().equals(record.getDispatchDept())).findFirst().get() : null;
+					if (ObjectUtils.isNotNull(dept)) {
+						record.setDispatchDeptName(dept.getDeptName());
 					}
 				}
 			}