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-23 10:32:54 +08:00
parent 1bca2163f3 6e7f17b48a
commit 5aa5ac0e37
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDeptListener.java
View File

@ -45,6 +45,9 @@ public class ApplyDeptListener implements TaskListener, ExecutionListener, Activ
@Value("${big_date.assignee_role_name}")
private String roleName; // 具备审批的角色名称
@Value("${big_date.default_assignee_role_id}")
private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
@Override
public void execute(DelegateExecution execution) throws Exception {
@ -116,6 +119,7 @@ public class ApplyDeptListener implements TaskListener, ExecutionListener, Activ
assignee = userDTO.getId().toString();
} else {
logger.error("未查到 {} 对应 " + roleName, deptDTO.getName());
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = null;
}
}

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

@ -52,6 +52,9 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A
@Value("${big_date.assignee_district_role_name}")
private String roleName; // 具备审批的角色名称
@Value("${big_date.default_assignee_role_id}")
private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
@Override
@ActivitiNoticeOperation(value = "申请发起人区市管理员审批", process = "能力申请流程")
public void notify(DelegateTask delegateTask) {
@ -81,7 +84,7 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A
SysDeptDTO deptDTO = sysDeptService.get(sysUserService.get(Long.parseLong(abilityApplicationDTO.getUserId())).getDeptId());
SysRegionEntity regionEntity =sysRegionService.getByLevel(deptDTO.getDistrict(), RegionLevelEnum.THREE);
SysRegionEntity regionEntity = sysRegionService.getByLevel(deptDTO.getDistrict(), RegionLevelEnum.THREE);
logger.error("regionEntityId:" + regionEntity.getId());
SysRoleDTO roleDTO = sysRoleService.getByName(roleName);
logger.error("roleDTOId:" + roleDTO.getId());
@ -96,7 +99,8 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A
assignee = userEntityOptional.get().getId().toString();
} else {
logger.error("未查到 {} 对应 " + roleName, deptDTO.getName());
assignee = null;
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = defaultAssigneeRoleId;
}
}

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

@ -52,6 +52,9 @@ public class CityListener implements TaskListener, ExecutionListener, ActivitiEv
@Value("${big_date.assignee_city_role_name}")
private String roleName; // 具备审批的角色名称
@Value("${big_date.default_assignee_role_id}")
private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
@Override
@ActivitiNoticeOperation(value = "市级区市管理员审批", process = "能力申请流程")
public void notify(DelegateTask delegateTask) {
@ -81,7 +84,7 @@ public class CityListener implements TaskListener, ExecutionListener, ActivitiEv
SysDeptDTO deptDTO = sysDeptService.get(sysUserService.get(Long.parseLong(abilityApplicationDTO.getUserId())).getDeptId());
SysRegionEntity regionEntity =sysRegionService.getByLevel(deptDTO.getDistrict(), RegionLevelEnum.TWO);
SysRegionEntity regionEntity = sysRegionService.getByLevel(deptDTO.getDistrict(), RegionLevelEnum.TWO);
logger.error("regionEntityId:" + regionEntity.getId());
SysRoleDTO roleDTO = sysRoleService.getByName(roleName);
logger.error("roleDTOId:" + roleDTO.getId());
@ -96,7 +99,8 @@ public class CityListener implements TaskListener, ExecutionListener, ActivitiEv
assignee = userEntityOptional.get().getId().toString();
} else {
logger.error("未查到 {} 对应 " + roleName, deptDTO.getName());
assignee = null;
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = defaultAssigneeRoleId;
}
}

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

@ -49,6 +49,9 @@ public class OwnerDistrictListener implements TaskListener, ExecutionListener, A
@Value("${big_date.assignee_district_role_name}")
private String roleName; // 具备审批的角色名称
@Value("${big_date.default_assignee_role_id}")
private String defaultAssigneeRoleId; // 当未查到审批人时将使用该用户审批
@Override
@ActivitiNoticeOperation(value = "资源所属区市管理员审批", process = "能力申请流程")
public void notify(DelegateTask delegateTask) {
@ -78,7 +81,7 @@ public class OwnerDistrictListener implements TaskListener, ExecutionListener, A
SysDeptDTO deptDTO = abilityApplicationDTO.getResourceOwnerDept();
SysRegionEntity regionEntity =sysRegionService.getByLevel(deptDTO.getDistrict(), RegionLevelEnum.THREE);
SysRegionEntity regionEntity = sysRegionService.getByLevel(deptDTO.getDistrict(), RegionLevelEnum.THREE);
logger.error("regionEntityId:" + regionEntity.getId());
SysRoleDTO roleDTO = sysRoleService.getByName(roleName);
logger.error("roleDTOId:" + roleDTO.getId());
@ -93,6 +96,7 @@ public class OwnerDistrictListener implements TaskListener, ExecutionListener, A
assignee = userEntityOptional.get().getId().toString();
} else {
logger.error("未查到 {} 对应 " + roleName, deptDTO.getName());
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = null;
}
}