|
@@ -1,7 +1,5 @@
|
|
|
package com.qmth.distributed.print.business.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.google.gson.reflect.TypeToken;
|
|
|
import com.qmth.boot.api.exception.ApiException;
|
|
@@ -23,7 +21,6 @@ import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
|
|
|
import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberMatch;
|
|
|
import com.qmth.teachcloud.common.bean.params.SysRoleGroupMemberMatchParams;
|
|
|
import com.qmth.teachcloud.common.bean.result.SysRoleGroupMemberMatchResult;
|
|
|
-import com.qmth.teachcloud.common.bean.vo.PaperInfoVo;
|
|
|
import com.qmth.teachcloud.common.config.DictionaryConfig;
|
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
import com.qmth.teachcloud.common.entity.BasicSchool;
|
|
@@ -450,14 +447,16 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
|
boolean myself = false;
|
|
|
if (!CollectionUtils.isEmpty(taskList)) {
|
|
|
for (Task t : taskList) {
|
|
|
- if (Objects.nonNull(t.getAssignee()) && t.getAssignee().equals(sysUser.getId().toString())) {
|
|
|
+ if (Objects.nonNull(t.getAssignee()) && Objects.equals(t.getAssignee(),
|
|
|
+ sysUser.getId().toString())) {
|
|
|
myself = true;
|
|
|
break;
|
|
|
} else {
|
|
|
List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(t.getId());
|
|
|
if (!CollectionUtils.isEmpty(identityLinkList)) {
|
|
|
for (IdentityLink i : identityLinkList) {
|
|
|
- if (i.getUserId().equals(sysUser.getId().toString())) {
|
|
|
+ if (Objects.nonNull(i.getUserId()) && Objects.equals(i.getUserId(),
|
|
|
+ sysUser.getId().toString())) {
|
|
|
myself = true;
|
|
|
break;
|
|
|
}
|