diff --git a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java index 820249d2..0c2110f4 100644 --- a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java @@ -95,7 +95,12 @@ public class SysPluginService implements ISysPluginService{ */ @Override public List findPluginOfAdded(PluginDto.FindPluginByTask param) { - List plugins = taskPluginDao.findPluginOfAdded(param.getTaskId(),param.getRoleId(),param.getPluginName(),param.getPluginType()); + //查找分解任务,通过分级任务找到任务详情 + ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId()); + if (ObjectUtil.isNull(proTaskSubTime)){ + throw new BaseException("获取任务信息错误"); + } + List plugins = taskPluginDao.findPluginOfAdded(proTaskSubTime.getTaskDetailId(),param.getRoleId(),param.getPluginName(),param.getPluginType()); plugins.forEach(plugin -> { if (plugin.getFileIdList().contains(",")){ String[] split = plugin.getFileIdList().split(","); @@ -143,8 +148,14 @@ public class SysPluginService implements ISysPluginService{ */ @Override public PageInfo findPluginOfNoAdded(PluginDto.FindPluginByTaskNo param) { + //查找分解任务,通过分级任务找到任务详情 + ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId()); + if (ObjectUtil.isNull(proTaskSubTime)){ + throw new BaseException("获取任务信息错误"); + } + PageHelper.startPage(param.getPageNum(),param.getPageSize()); - List plugins = taskPluginDao.findPluginOfNoAdded(param.getTaskId(),param.getRoleId(),param.getPluginName(),param.getPluginType()); + List plugins = taskPluginDao.findPluginOfNoAdded(proTaskSubTime.getTaskDetailId(),param.getRoleId(),param.getPluginName(),param.getPluginType()); plugins.forEach(plugin -> { if (plugin.getFileIdList().contains(",")){ String[] split = plugin.getFileIdList().split(","); @@ -277,8 +288,10 @@ public class SysPluginService implements ISysPluginService{ ProTaskPluginExample taskPluginExample = new ProTaskPluginExample(); taskPluginExample.createCriteria().andPluginIdEqualTo(param.getPluginId()) .andTaskDetailIdEqualTo(taskDetail.getId()) - .andMemberRoleIdNotEqualTo(param.getRoleId()); - taskPluginDao.deleteByExample(taskPluginExample); + .andMemberRoleIdEqualTo(param.getRoleId()); + ProTaskPlugin taskPlugin = new ProTaskPlugin(); + taskPlugin.setRecStatus((byte)2); + taskPluginDao.updateByExampleSelective(taskPlugin,taskPluginExample); }else { throw new BaseException("权限不足"); }