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-08-18 14:53:58 +08:00
parent 069a42e0c0 92542c2ad8
commit fc11b15fbf
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
View File

@ -233,8 +233,11 @@ public class AbilityCenterControllerV3 {
auditingBaseDTO.setCompleteEntry(Boolean.TRUE); // 首次录入
auditingBaseDTO.setFlowType("能力申请");
Map<String, Object> variables = oMapper.convertValue(auditingBaseDTO, Map.class);
if (user.getDeptId() != null) {
SysDeptDTO applyUserDeptDTO = sysDeptService.get(user.getDeptId()); // 发起人的部门
}
Map<String, Object> variables = oMapper.convertValue(auditingBaseDTO, Map.class);
variables.putAll(new HashMap<String, Object>() { // 流程内携带属性值
{
put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请

2
renren-admin/src/main/java/io/renren/modules/processForm/listener/ApplyDistrictListener.java → renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java
View File

@ -1,4 +1,4 @@
package io.renren.modules.processForm.listener;
package io.renren.modules.processForm.listener.v3;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

2
renren-admin/src/main/java/io/renren/modules/processForm/listener/CityListener.java → renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CityListener.java
View File

@ -1,4 +1,4 @@
package io.renren.modules.processForm.listener;
package io.renren.modules.processForm.listener.v3;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

3
renren-admin/src/main/java/io/renren/modules/processForm/listener/OwnerDistrictListener.java → renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/OwnerDistrictListener.java
View File

@ -1,4 +1,4 @@
package io.renren.modules.processForm.listener;
package io.renren.modules.processForm.listener.v3;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@ -6,6 +6,7 @@ import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import io.renren.common.annotation.ActivitiNoticeOperation;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.listener.v3.ApplyDistrictListener;
import io.renren.modules.sys.dto.SysDeptDTO;
import io.renren.modules.sys.dto.SysRoleDTO;
import io.renren.modules.sys.dto.SysUserDTO;