wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-10 14:02:58 +08:00
parent 41cb130314 aa225e9255
commit b8de7ee235
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
View File

@ -142,16 +142,19 @@ public class SysDeptController {
}
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> finalTemp = temp;
List<Map<String, Object>> list_ = list_metting.stream().map(index -> index.get("dept")).filter(index -> index != null).collect(Collectors.toList())
.stream().filter(index -> !temp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
.stream().filter(index -> !finalTemp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
put("id", null);
put("name", index.toString());
}}).collect(Collectors.toList());
list.addAll(list_); // 获取会客厅申请部门
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<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())
.stream().filter(index -> !temp.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
.stream().filter(index -> !finalTemp1.contains(index.toString())).map(index -> new HashMap<String, Object>() {{
put("id", null);
put("name", index.toString());
}}).collect(Collectors.toList());