pms 日报 项目 责任人 数据权限调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/IotProjectTaskController.java

@@ -87,11 +87,11 @@ public class IotProjectTaskController {
     @PreAuthorize("@ss.hasPermission('rq:iot-project-task:query')")
     public CommonResult<PageResult<IotProjectTaskRespVO>> getIotProjectTaskPage(@Valid IotProjectTaskPageReqVO pageReqVO) {
         Set<Long> idList = new HashSet<>();
-        if(Objects.nonNull(pageReqVO.getDeptId())){
+        /* if(Objects.nonNull(pageReqVO.getDeptId())){
             idList =  deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
             idList.add(pageReqVO.getDeptId());
-        }
-        PageResult<IotProjectTaskDO> pageResult = iotProjectTaskService.getIotProjectTaskPage1(pageReqVO,idList);
+        } */
+        PageResult<IotProjectTaskDO> pageResult = iotProjectTaskService.getIotProjectTaskPage1(pageReqVO, idList);
         return success(BeanUtils.toBean(pageResult, IotProjectTaskRespVO.class));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskPageReqVO.java

@@ -15,6 +15,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class IotProjectTaskPageReqVO extends PageParam {
 
+    @Schema(description = "任务id", example = "123")
+    private Long id;
+
     @Schema(description = "项目id", example = "2988")
     private Long projectId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojecttask/IotProjectTaskMapper.java

@@ -38,6 +38,7 @@ public interface IotProjectTaskMapper extends BaseMapperX<IotProjectTaskDO> {
 
     default PageResult<IotProjectTaskDO> selectPage1(IotProjectTaskPageReqVO reqVO,Collection<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotProjectTaskDO>()
+                .eqIfPresent(IotProjectTaskDO::getId, reqVO.getId())
                 .eqIfPresent(IotProjectTaskDO::getProjectId, reqVO.getProjectId())
                 .likeIfPresent(IotProjectTaskDO::getWellName, reqVO.getWellName())
                 .eqIfPresent(IotProjectTaskDO::getWellType, reqVO.getWellType())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotprojecttask/IotProjectTaskServiceImpl.java

@@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectinfo.IotProjectInfoDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotprojectinfo.IotProjectInfoMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotprojecttask.IotProjectTaskMapper;
 import cn.iocoder.yudao.module.pms.service.iotprojectinfo.IotProjectInfoService;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@@ -35,6 +37,9 @@ public class IotProjectTaskServiceImpl implements IotProjectTaskService {
     @Resource
     private IotProjectInfoService iotProjectInfoService;
 
+    @Resource
+    private IotProjectInfoMapper iotProjectInfoMapper;
+
     @Override
     public Long createIotProjectTask(IotProjectTaskSaveReqVO createReqVO) {
         // 插入
@@ -49,6 +54,9 @@ public class IotProjectTaskServiceImpl implements IotProjectTaskService {
         List<IotProjectTaskDO> taskDOS = new ArrayList<>();
         for (IotProjectTaskSaveReqVO saveReqVO:list) {
             IotProjectTaskDO iotProjectTask = BeanUtils.toBean(saveReqVO, IotProjectTaskDO.class);
+            // 将项目的 deptId 赋值给 任务的 deptId
+            IotProjectInfoDO project = iotProjectInfoMapper.selectById(iotProjectTask.getProjectId());
+            iotProjectTask.setDeptId(project.getDeptId());
             taskDOS.add(iotProjectTask);
         }
         return iotProjectTaskMapper.insertBatch(taskDOS);
@@ -99,7 +107,7 @@ public class IotProjectTaskServiceImpl implements IotProjectTaskService {
 
     @Override
     public PageResult<IotProjectTaskDO> getIotProjectTaskPage1(IotProjectTaskPageReqVO pageReqVO, Collection<Long> deptIds) {
-        return iotProjectTaskMapper.selectPage1(pageReqVO,deptIds);
+        return iotProjectTaskMapper.selectPage1(pageReqVO, deptIds);
     }
 
     @Override

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -273,14 +273,15 @@ public class DeptServiceImpl implements DeptService {
                 deptId.set(departmentId);
             });
         }
-        DeptDO dept = getDept(deptId.get());
-        if (ObjUtil.isEmpty(dept)) {
-            throw exception(DEPT_NOT_FOUND);
-        }
-        // 用于存储最终需要返回的部门列表
+        // 存储最终需要返回的部门列表
         List<DeptDO> resultDepts = new ArrayList<>();
 
         DataPermissionUtils.executeIgnore(() -> {
+            DeptDO dept = getDept(deptId.get());
+            if (ObjUtil.isEmpty(dept)) {
+                throw exception(DEPT_NOT_FOUND);
+            }
+
             // 一级部门
             List<DeptDO> theFirstLevelDepts = deptMapper.selectListByParentId(parentIds);
             System.out.println("顶级部门数量：" + theFirstLevelDepts.size());