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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-13 23:08:18 +08:00
parent 24f1053ddd 4fdfb45b1c
commit 19db902082
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1899,7 +1899,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
public Object selectCollectResourceList() { public Object selectCollectResourceList() {
List<Map> resourceCountList = baseDao.selectCollectResourceList(); List<Map> resourceCountList = baseDao.selectCollectResourceList();
Map result = new HashMap(); Map result = new HashMap();
resourceCountList.stream().filter(it -> !it.get("type").equals("")).forEach(it -> result.put(it.get("type"), it.get("count"))); resourceCountList.stream().filter(it -> it.get("type") != null && !it.get("type").equals("")).forEach(it -> result.put(it.get("type"), it.get("count")));
return result; return result;
} }

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

@ -1904,14 +1904,17 @@
AND su.dept_id = sd.id AND su.dept_id = sd.id
AND taa.resource_id = tdr.id AND taa.resource_id = tdr.id
AND dept.id = tdr.dept_id AND dept.id = tdr.dept_id
<choose> <!--<choose>
<when test="approveStatus != null and approveStatus != ''"> <when test="approveStatus != null and approveStatus != ''">
AND taa.approve_status = #{approveStatus} AND taa.approve_status = #{approveStatus}
</when> </when>
<otherwise> <otherwise>
AND taa.approve_status != '不通过' AND taa.approve_status != '不通过'
</otherwise> </otherwise>
</choose> </choose> -->
<if test="approveStatus != null and approveStatus != ''">
AND taa.approve_status = #{approveStatus}
</if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
AND sd.id = #{deptId} AND sd.id = #{deptId}
</if> </if>