Merge branch 'dev'
This commit is contained in:
commit
4fdfb45b1c
|
@ -1899,7 +1899,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
public Object selectCollectResourceList() {
|
||||
List<Map> resourceCountList = baseDao.selectCollectResourceList();
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -1904,14 +1904,17 @@
|
|||
AND su.dept_id = sd.id
|
||||
AND taa.resource_id = tdr.id
|
||||
AND dept.id = tdr.dept_id
|
||||
<choose>
|
||||
<!--<choose>
|
||||
<when test="approveStatus != null and approveStatus != ''">
|
||||
AND taa.approve_status = #{approveStatus}
|
||||
</when>
|
||||
<otherwise>
|
||||
AND taa.approve_status != '不通过'
|
||||
</otherwise>
|
||||
</choose>
|
||||
</choose> -->
|
||||
<if test="approveStatus != null and approveStatus != ''">
|
||||
AND taa.approve_status = #{approveStatus}
|
||||
</if>
|
||||
<if test="deptId != null and deptId != ''">
|
||||
AND sd.id = #{deptId}
|
||||
</if>
|
||||
|
|
Loading…
Reference in New Issue