Compare commits
No commits in common. "f6d8cb2c95f5aeeedf23ee81e3a83471bd3082a2" and "f79cb8d3fa27265c5481d947e1e112e7d8b8fbd7" have entirely different histories.
f6d8cb2c95
...
f79cb8d3fa
|
@ -142,19 +142,16 @@ public class SysDeptController {
|
||||||
}
|
}
|
||||||
List<Map<String, Object>> list_metting = jdbcTemplate.queryForList("SELECT DISTINCT dept from t_meetingroom_book WHERE dept IS NOT NULL;");
|
List<Map<String, Object>> list_metting = jdbcTemplate.queryForList("SELECT DISTINCT dept from t_meetingroom_book WHERE dept IS NOT NULL;");
|
||||||
List<String> temp = list.stream().map(index -> index.get("name")).filter(index -> index != null).map(index -> index.toString()).distinct().collect(Collectors.toList());
|
List<String> temp = list.stream().map(index -> index.get("name")).filter(index -> index != null).map(index -> index.toString()).distinct().collect(Collectors.toList());
|
||||||
List<String> finalTemp = temp;
|
|
||||||
List<Map<String, Object>> list_ = list_metting.stream().map(index -> index.get("dept")).filter(index -> index != null).collect(Collectors.toList())
|
List<Map<String, Object>> list_ = list_metting.stream().map(index -> index.get("dept")).filter(index -> index != null).collect(Collectors.toList())
|
||||||
.stream().filter(index -> !finalTemp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
|
.stream().filter(index -> !temp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
|
||||||
put("id", null);
|
put("id", null);
|
||||||
put("name", index.toString());
|
put("name", index.toString());
|
||||||
}}).collect(Collectors.toList());
|
}}).collect(Collectors.toList());
|
||||||
list.addAll(list_); // 获取会客厅申请部门
|
list.addAll(list_); // 获取会客厅申请部门
|
||||||
if (cloud) {
|
if (cloud) {
|
||||||
temp = list.stream().map(index -> index.get("name")).filter(index -> index != null).map(index -> index.toString()).distinct().collect(Collectors.toList());
|
|
||||||
List<Map<String, Object>> list_zwy = lcJdbcTemplate.queryForList(getAllsql);
|
List<Map<String, Object>> list_zwy = lcJdbcTemplate.queryForList(getAllsql);
|
||||||
List<String> finalTemp1 = temp;
|
|
||||||
List<Map<String, Object>> list_1 = list_zwy.stream().map(index -> index.get("deptName")).filter(index -> index != null).distinct().collect(Collectors.toList())
|
List<Map<String, Object>> list_1 = list_zwy.stream().map(index -> index.get("deptName")).filter(index -> index != null).distinct().collect(Collectors.toList())
|
||||||
.stream().filter(index -> !finalTemp1.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
|
.stream().filter(index -> !temp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
|
||||||
put("id", null);
|
put("id", null);
|
||||||
put("name", index.toString());
|
put("name", index.toString());
|
||||||
}}).collect(Collectors.toList());
|
}}).collect(Collectors.toList());
|
||||||
|
|
Loading…
Reference in New Issue