|
@@ -45,9 +45,8 @@ public class ContractController {
|
|
|
}
|
|
|
|
|
|
private void rooms(List<Contract> list) {
|
|
|
- Map<Long, String> rooms = new HashMap();
|
|
|
for (Contract ct : list) {
|
|
|
- rooms.clear();
|
|
|
+ Map<Long, String> rooms = new HashMap();
|
|
|
if (StringUtil.notBlank(ct.getProjectItemTargetRoomIds())) {
|
|
|
ct.setRoomMap(projectItemTargetRoomService.getRoomLevel(rooms, ct.getProjectItemTargetRoomIds()));
|
|
|
}
|
|
@@ -55,9 +54,8 @@ public class ContractController {
|
|
|
}
|
|
|
|
|
|
private void tags(List<Contract> list) {
|
|
|
- List<Tag> tags = new ArrayList<>();
|
|
|
for (Contract ct : list) {
|
|
|
- tags.clear();
|
|
|
+ List<Tag> tags = new ArrayList<>();
|
|
|
if (StringUtil.notBlank(ct.getTagIds())) {
|
|
|
for (String tagId : ct.getTagIds().split(",")) {
|
|
|
tags.add(projectItemTargetRoomService.getTag(Long.parseLong(tagId)));
|