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

Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev

This commit is contained in:
wangliwen 2022-07-21 15:59:57 +08:00
parent 544a673f2a 67f8811b21
commit 0ac8ef8940
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -209,8 +209,6 @@ public class ActTaskService extends BaseServiceImpl {
for (Task task : list) { for (Task task : list) {
TaskDTO dto = new TaskDTO(); TaskDTO dto = new TaskDTO();
this.convertTaskInfo(task, dto); this.convertTaskInfo(task, dto);
//Optional<SysUserEntity> sysUserEntity = Optional.ofNullable(sysUserService.selectById(dto.getUserId()));
//dto.setUserName(sysUserEntity.get().getRealName());
Map<String, Object> processVariable = new LinkedHashMap<>(); Map<String, Object> processVariable = new LinkedHashMap<>();
if (dto.getBusinessKey().startsWith("{") || dto.getBusinessKey().startsWith("[")) { // 为json内容 (特殊处理批量) if (dto.getBusinessKey().startsWith("{") || dto.getBusinessKey().startsWith("[")) { // 为json内容 (特殊处理批量)

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

@ -791,6 +791,7 @@
WHERE 1 = 1 WHERE 1 = 1
AND del_flag = 0 AND del_flag = 0
AND dept_id = #{deptId} AND dept_id = #{deptId}
LIMIT 30
</select> </select>
<select id="selectDeptCountList" resultType="java.util.Map"> <select id="selectDeptCountList" resultType="java.util.Map">
@ -857,6 +858,7 @@
AND su.id = taa.user_id AND su.id = taa.user_id
AND taa.resource_id = tdr.id AND taa.resource_id = tdr.id
AND su.dept_id = #{deptId} AND su.dept_id = #{deptId}
LIMIT 30
</select> </select>
<select id="selectApplyDeptCountList" resultType="java.util.Map"> <select id="selectApplyDeptCountList" resultType="java.util.Map">