|
|
@ -363,15 +363,15 @@ public class TaskController {
|
|
|
|
// 添加任务部门
|
|
|
|
// 添加任务部门
|
|
|
|
List<Integer> departmentIdList = task.getDepartmentList();
|
|
|
|
List<Integer> departmentIdList = task.getDepartmentList();
|
|
|
|
List departmentGroupList = task.getDepartmentGroupList();
|
|
|
|
List departmentGroupList = task.getDepartmentGroupList();
|
|
|
|
if (departmentIdList != null && departmentGroupList != null) {
|
|
|
|
if (departmentIdList != null || departmentGroupList != null) {
|
|
|
|
List dpIdList = new ArrayList();
|
|
|
|
List dpIdList = new ArrayList();
|
|
|
|
if (departmentIdList != null && departmentIdList.size() > 0) {
|
|
|
|
if (departmentIdList != null && departmentIdList.size() > 0) {
|
|
|
|
for (Integer e : departmentIdList) {
|
|
|
|
for (Integer e : departmentIdList) {
|
|
|
|
dpIdList.add(e);
|
|
|
|
dpIdList.add(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<Integer> departmentIdList1 = qywxDepartmentGroupLinkService.departmentIdList(null, departmentGroupList);
|
|
|
|
|
|
|
|
if (departmentGroupList != null && departmentGroupList.size() > 0) {
|
|
|
|
if (departmentGroupList != null && departmentGroupList.size() > 0) {
|
|
|
|
|
|
|
|
List<Integer> departmentIdList1 = qywxDepartmentGroupLinkService.departmentIdList(null, departmentGroupList);
|
|
|
|
if (departmentIdList != null && departmentIdList.size() > 0) {
|
|
|
|
if (departmentIdList != null && departmentIdList.size() > 0) {
|
|
|
|
for (Integer e : departmentIdList1) {
|
|
|
|
for (Integer e : departmentIdList1) {
|
|
|
|
dpIdList.add(e);
|
|
|
|
dpIdList.add(e);
|
|
|
|