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-07-19 13:59:24 +08:00
parent bbedac70f0 b843f76d0f
commit cbc0018a36
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO;
import io.renren.modules.resourceMountApply.service.TResourceMountApplyService; import io.renren.modules.resourceMountApply.service.TResourceMountApplyService;
import io.renren.modules.security.user.SecurityUser; import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.dto.SysUserDTO;
import io.renren.modules.sys.entity.SysUserEntity;
import io.renren.modules.sys.service.SysRoleUserService; import io.renren.modules.sys.service.SysRoleUserService;
import io.renren.modules.sys.service.SysUserService; import io.renren.modules.sys.service.SysUserService;
import org.activiti.engine.HistoryService; import org.activiti.engine.HistoryService;
@ -189,7 +190,8 @@ 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);
dto.setUserName(sysUserService.selectById(dto.getUserId()).getRealName()); //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内容 (特殊处理批量)
@ -206,6 +208,7 @@ public class ActTaskService extends BaseServiceImpl {
processVariable.putAll(variables); processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables()); processVariable.putAll(task.getProcessVariables());
dto.setParams(processVariable); dto.setParams(processVariable);
dto.setUserName(abilityApplicationDTO.getUser());
listDto.add(dto); listDto.add(dto);
continue; continue;
} }
@ -215,6 +218,7 @@ public class ActTaskService extends BaseServiceImpl {
processVariable.putAll(variables); processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables()); processVariable.putAll(task.getProcessVariables());
dto.setParams(processVariable); dto.setParams(processVariable);
dto.setUserName(resourceMountApplyDTO.getUserName());
listDto.add(dto); listDto.add(dto);
continue; continue;
} }
@ -224,6 +228,7 @@ public class ActTaskService extends BaseServiceImpl {
processVariable.putAll(variables); processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables()); processVariable.putAll(task.getProcessVariables());
dto.setParams(processVariable); dto.setParams(processVariable);
dto.setUserName(tDemandDataDTO.getApplyUserName());
listDto.add(dto); listDto.add(dto);
continue; continue;
} }
@ -233,6 +238,7 @@ public class ActTaskService extends BaseServiceImpl {
processVariable.putAll(variables); processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables()); processVariable.putAll(task.getProcessVariables());
dto.setParams(processVariable); dto.setParams(processVariable);
dto.setUserName(resourceDTO.getUndercarriageUserName());
listDto.add(dto); listDto.add(dto);
continue; continue;
} }
@ -243,6 +249,7 @@ public class ActTaskService extends BaseServiceImpl {
processVariable.putAll(variables); processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables()); processVariable.putAll(task.getProcessVariables());
dto.setParams(processVariable); dto.setParams(processVariable);
dto.setUserName(tDemandCommentDTO.getName());
listDto.add(dto); listDto.add(dto);
continue; continue;
} }

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

@ -123,7 +123,9 @@
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
WHERE 1 = 1 WHERE 1 = 1
AND tdr.del_flag = 0 AND tdr.del_flag = 0
AND tdr.type != '赋能案例' <if test="dto.type != '赋能案例'">
AND tdr.type != '赋能案例'
</if>
<if test="dto.type != null and dto.type != ''"> <if test="dto.type != null and dto.type != ''">
AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE) AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE)
</if> </if>
@ -374,11 +376,14 @@
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
WHERE 1 = 1 WHERE 1 = 1
AND tdr.del_flag = 0 AND tdr.del_flag = 0
AND tdr.type != '赋能案例'
<if test="dto.type != '赋能案例'">
AND tdr.type != '赋能案例'
</if>
<if test="dto.name != null and dto.name != ''"> <if test="dto.name != null and dto.name != ''">
AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE) AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE)
</if> </if>
<if test="dto.type != null and dto.type != ''"> <if test="dto.type != null and dto.type != '' ">
AND tdr.type = #{dto.type} AND tdr.type = #{dto.type}
</if> </if>