Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java

@@ -84,9 +84,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
                     boolean score = Boolean.valueOf(params.get("score").toString());
                     String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
                     if (score) {
-                        wrapper.exists(sql);
+                        wrapper.exists(sql).ne("approve_status", "不通过");
                     } else {
-                        wrapper.notExists(sql);
+                        wrapper.notExists(sql).ne("approve_status", "不通过");
                     }
                     break;
             }

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -2459,6 +2459,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             countMap.put("count", total);
             HashMap<String, Object> count = new HashMap<>();
             count.put("name", "总计");
+            if (!cloud) {
+                countMap.put("yzy", 0);
+                countMap.put("ysp", 0);
+            }
             count.putAll(countMap);
             resultList.add(count);
             return resultList;

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

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 部门管理
@@ -108,6 +109,14 @@ 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()).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 -> !temp.contains(index.toString())).map(index -> new LinkedHashMap() {{
+                    put("id", null);
+                    put("name", index.toString());
+                }}).collect(Collectors.toList());
+        list.addAll(list_); // 获取会客厅申请部门
         return new Result<List<Map<String, Object>>>().ok(list);
     }