Browse Source

Merge branch 'feat-20220829-jinpaitasktype' into temp-pre

lixuesong 2 years ago
parent
commit
cd1ef9443d

+ 3 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -920,7 +920,9 @@ public class ApiController {
 		// 把上述操作没有覆盖到的子id加进来
 		Set<String> tempIds = temp.stream().map(WmTaskType::getId).collect(Collectors.toSet());
 		Set<String> extCIds = id.stream().filter(s -> !tempIds.contains(s)).collect(Collectors.toSet());
-		temp.addAll(wmTaskTypeService.listByIds(extCIds));
+		if (CollUtil.isNotEmpty(extCIds)) {
+			temp.addAll(wmTaskTypeService.listByIds(extCIds));
+		}
 
 		List<String> baseNames = temp.stream().
 				map(WmTaskType::getTaskTypeName).distinct().collect(Collectors.toList());