Merge remote-tracking branch 'origin/dev' into dev

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

@@ -533,11 +533,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object selectTotal() {
         HashMap<String, Object> resultMap = new HashMap<>();
         List<Map> re = resourceDao.selectTypeCount(null);
-        //2022-07-05,ytl修改 start
+        /*//2022-07-05,ytl修改 start
         re.removeIf(r -> {
             return org.apache.commons.lang3.StringUtils.equals(r.get("type").toString(), "基础设施");
         });
-        //2022-07-05,ytl修改 end
+        //2022-07-05,ytl修改 end*/
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
             case TSINGTAO_XHA: { // 青岛西海岸
                 CompletableFuture allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -536,11 +536,9 @@
 
     <select id="countAllDept" resultType="java.lang.Long">
         SELECT
-        COUNT( DISTINCT dept_id )
+        COUNT(id)
         FROM
-        tb_data_resource
-        WHERE
-        del_flag = 0
+        sys_dept
     </select>
 
     <select id="selectGroupByDeptId" resultType="java.util.Map">