From fe9fbd89925432af4eb748a2f9c3cce29dc630f9 Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Sat, 12 Oct 2024 10:15:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8D=8F=E4=BD=9C=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=89=80=E6=9C=89=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=8A=9E=E5=85=AC=E5=AE=A4=E4=B8=BB=E4=BB=BB=E3=80=81=E5=89=AF?= =?UTF-8?q?=E6=89=80=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdminTaskServiceImpl.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/xqopen/kehui/admin/service/impl/AdminTaskServiceImpl.java b/src/main/java/com/xqopen/kehui/admin/service/impl/AdminTaskServiceImpl.java index 18a0e6c..903bfce 100644 --- a/src/main/java/com/xqopen/kehui/admin/service/impl/AdminTaskServiceImpl.java +++ b/src/main/java/com/xqopen/kehui/admin/service/impl/AdminTaskServiceImpl.java @@ -1,16 +1,17 @@ package com.xqopen.kehui.admin.service.impl; -import java.sql.Array; -import java.util.*; - import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.plugins.Page; -import com.xqopen.kehui.admin.dto.*; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.xqopen.kehui.admin.dto.AdminTaskReqs; +import com.xqopen.kehui.admin.dto.QuarterlyPlanTaskHasDown; +import com.xqopen.kehui.admin.dto.QuarterlyPlanTaskResp; +import com.xqopen.kehui.admin.dto.QuarterlyTaskReq; import com.xqopen.kehui.admin.entity.AdminDocumentManagement; import com.xqopen.kehui.admin.entity.AdminTask; import com.xqopen.kehui.admin.service.IAdminDocumentManagementService; +import com.xqopen.kehui.admin.service.IAdminTaskService; import com.xqopen.kehui.admin.unit.TaskTypeEnum; import com.xqopen.kehui.common.entity.SystemContent; import com.xqopen.kehui.common.service.ISystemContentService; @@ -19,17 +20,17 @@ import com.xqopen.kehui.common.service.ISystemUserRoleService; import com.xqopen.kehui.exception.ErrorCode; import com.xqopen.kehui.exception.XQException; import com.xqopen.kehui.mapper.AdminTaskDao; -import com.xqopen.kehui.admin.service.IAdminTaskService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; - -import com.xqopen.kehui.personal.entity.PersonalMember; import com.xqopen.kehui.personal.service.IPersonalMemberService; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** *

* 任务管理 服务实现类 @@ -153,7 +154,7 @@ public class AdminTaskServiceImpl extends ServiceImpl i } } else if (adminTaskReqs.getTaskType() == TaskTypeEnum.COOPERATIONTASK.getIndex()) { - if (userRoleName.contains("所长")) { + if (userRoleName.contains("所长")||userRoleName.contains("副所长") || userRoleName.contains("办公室主任")) { postTaskList = taskDao.getAllList(page, userId, adminTaskReqs); } else if (iSystemUserOrgService.checkIsLeader(userId) > 0) {//如果是部门领导，则可以看本部门下的