diff --git a/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java b/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java index aa46ddf..f8f7678 100644 --- a/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java +++ b/src/main/java/com/xit/biz/ctgy/service/impl/ResidentAndDisabledService.java @@ -39,6 +39,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static java.util.stream.Collectors.toMap; + @Service @RequiredArgsConstructor @Slf4j @@ -201,6 +203,13 @@ public class ResidentAndDisabledService implements IResidentAndDisabledService { paramMap.put("msSeq", m.get("msSeq")); paramMap.put("msCarnum", m.get("msCarnum")); m.put("simsa", mapper.selectJudgeResultByCarnum(paramMap)); +// Map usersMap = mapper.selectJudgeResultByCarnum(paramMap) +// .stream() +// .reduce((preMap, curMap) -> { +// preMap.putAll(curMap); +// return preMap; +// }).orElse(null); +// m.putAll(usersMap); }).collect(Collectors.toList()); resultMap.put("totUserList", totJudgeUserList); diff --git a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml index 58dc6d5..a0eccf5 100644 --- a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml +++ b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml @@ -78,6 +78,7 @@ AND MSU.msu_team = #{msuTeam} AND MSU.msu_userid = MU.userid GROUP BY MSU.msu_userid, MU.name + ORDER BY MSU.msu_userid, MU.name \ No newline at end of file