相关方人员
parent
246de69195
commit
6c0fe2170c
|
@ -19,11 +19,9 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.net.PasswordAuthentication;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
|
@ -383,7 +381,9 @@ public class XgfUserServiceImpl implements XgfUserService {
|
|||
for (PageData x : list) {
|
||||
condition.clear();
|
||||
condition.put("FLOW_ID", x.getString("FLOW_ID"));
|
||||
x.put("flow", flowDetailMapper.getList(condition));
|
||||
List<PageData> flow = flowDetailMapper.getList(condition);
|
||||
flow = flow.stream().sorted(Comparator.comparing(o -> new BigDecimal(String.valueOf(o.get("SORT"))))).collect(Collectors.toList());
|
||||
x.put("flow",flow);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue