修改错误的参数取值

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/WorkFlowEnum.java

@@ -18,7 +18,7 @@ public enum WorkFlowEnum {
 	GROUPNAME("groupName","角色组的key"),
 	NAME("name","任务节点的key"),
 	PROCESSINSTANCEID("processInstanceId",""),
-	ASSIGN("assign","角色执行人key");
+	ASSIGN("assignee","角色执行人key");
 	
 	private String code;//对应菜单组件名称
     private String desc;//描述

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/WorkflowExcuteServiceImpl.java

@@ -56,7 +56,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 	public Map<String, Object> checkTaskAuthMap(String processInstanceId, ReginParams userInfo) {
 		// 获取当前登录用户的角色
 		String currentLoginUserRole = userInfo.getRole().getRoleName();
-		String currentLoginUserId = userInfo.getUserModel().getUserId();
+		String currentLoginUserName = userInfo.getUserModel().getUserName();
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put(WorkFlowEnum.CHECKFLAG.getCode(), false);
 		JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
@@ -86,7 +86,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 							.getString(WorkFlowEnum.ASSIGN.getCode());
 					if (StringUtils.isNotBlank(assignUser)) {
 						// 如果当前登录人与当前任务的设定人不一定，则直接返回权限校验失败
-						if (!assignUser.contains(currentLoginUserId)) {
+						if (!assignUser.contains(currentLoginUserName)) {
 							return map;
 						}
 						map.put(WorkFlowEnum.TASKID.getCode(), detail.getString(WorkFlowEnum.ID.getCode()));
@@ -144,7 +144,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 					.getTaskGroupName(detail.getString(WorkFlowEnum.ID.getCode()));
 			try {
 				if (taskGroupNameObject.getJSONArray(WorkFlowEnum.DATA.getCode()) == null
-						&& taskGroupNameObject.getJSONArray(WorkFlowEnum.DATA.getCode()).size() < 1) {
+						|| taskGroupNameObject.getJSONArray(WorkFlowEnum.DATA.getCode()).size() < 1) {
 					workflowFeignService.setTaskUser(detail.getString(WorkFlowEnum.ID.getCode()), userId);
 				}
 			} catch (Exception e) {