|
@@ -43,6 +43,7 @@ import com.minto.app.integration.beans.ConfigurationIntegrationBean;
|
|
|
import com.minto.app.integration.enums.IntegrateEnum;
|
|
|
import com.minto.app.integration.manager.IntegrationManager;
|
|
|
import com.minto.app.message.enums.MessageResourceTypeEnum;
|
|
|
+import com.minto.app.organization.OrgEnum;
|
|
|
import com.minto.app.organization.OrgEnum.OrgRoleEnum;
|
|
|
import com.minto.app.organization.beans.OrgLevelBean;
|
|
|
import com.minto.app.organization.beans.OrgPersonBean;
|
|
@@ -3215,7 +3216,10 @@ public class MtTaskController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
// 获取当前人员是部门主管的所有部门
|
|
|
- List<Long> masterIds = TaskByTypeUtil.getDepByManagerId(personId, AppContext.currentLoginAccount());
|
|
|
+ List<Long> masterIds = TaskByTypeUtil.getDepByManagerId(personId, accountId);
|
|
|
+ // 获取当前人员是部门任务联络员的所有部门
|
|
|
+ List<Long> taskManagerDeptIds = TaskByTypeUtil.getDeptIdByCodes(personId, accountId,
|
|
|
+ List.of(OrgEnum.OrgRoleEnum.TaskManager.name()));
|
|
|
|
|
|
// 用来更新阅读时间
|
|
|
Long[] mids = new Long[currMembers.size()];
|
|
@@ -3250,6 +3254,7 @@ public class MtTaskController extends BaseController {
|
|
|
// }
|
|
|
//判断事项与登录人的关系
|
|
|
boolean isDepMaster = false;
|
|
|
+ boolean isDepTaskManager = false;
|
|
|
// 是否是责任人
|
|
|
boolean isManager = false;
|
|
|
// 是否是督办人
|
|
@@ -3368,6 +3373,10 @@ public class MtTaskController extends BaseController {
|
|
|
&& masterIds.contains(member.getResourceId())) {
|
|
|
isDepMaster = true;
|
|
|
}
|
|
|
+ if (member.getResourceType() == ResourceTypeEnum.OrgDepartment.getKey()
|
|
|
+ && taskManagerDeptIds.contains(member.getResourceId())) {
|
|
|
+ isDepTaskManager = true;
|
|
|
+ }
|
|
|
// 是否是分派,目前假设分派的人员只会是分派的人员
|
|
|
if (member.getParentId() != null) {
|
|
|
isDispatch = true;
|
|
@@ -3375,6 +3384,7 @@ public class MtTaskController extends BaseController {
|
|
|
if(taskMemberRelTypeEnum==TaskLeadUnit){
|
|
|
isTaskLeadUnit = true;
|
|
|
}
|
|
|
+
|
|
|
break;
|
|
|
case Participant:
|
|
|
if (isProcessing) {
|
|
@@ -3389,6 +3399,10 @@ public class MtTaskController extends BaseController {
|
|
|
&& masterIds.contains(member.getResourceId())) {
|
|
|
isDepMaster = true;
|
|
|
}
|
|
|
+ if (member.getResourceType() == ResourceTypeEnum.OrgDepartment.getKey()
|
|
|
+ && taskManagerDeptIds.contains(member.getResourceId())) {
|
|
|
+ isDepTaskManager = true;
|
|
|
+ }
|
|
|
//判断协办能否分派
|
|
|
if(needParticipantDispatch){
|
|
|
canDispatch = true;
|
|
@@ -3494,6 +3508,7 @@ public class MtTaskController extends BaseController {
|
|
|
model.put("roleActions",roleActions);
|
|
|
model.put("isManager", isManager);
|
|
|
model.put("isDepMaster",isDepMaster);
|
|
|
+ model.put("isDepTaskManager", isDepTaskManager);
|
|
|
model.put("isParticipant", isParticipant);
|
|
|
model.put("isSuperviseBoss", isSuperviseBoss);
|
|
|
|