Merge remote-tracking branch 'origin/pre-production'

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java

@@ -173,7 +173,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 		//获取所有的操作人ID
 		List<Long> operateUserIds = records.stream().map(BasicdataStockArticleVO::getOperateUser).collect(Collectors.toList());
 		List<User> listR = new ArrayList<>();
-		if (CollUtil.isEmpty(operateUserIds)) {
+		if (CollUtil.isNotEmpty(operateUserIds)) {
 			R<List<User>> temp = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA));
 			if (temp.isSuccess() && temp.getData() != null) {
 				listR.addAll(temp.getData());
@@ -185,9 +185,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 					record.setOperateUserName(datum.getRealName());
 				}
 			}
-
 		}
-
 		return data;
 	}