diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java index e03322d2..c41b2276 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java @@ -81,6 +81,7 @@ public class JobController { if (resources.getId() != null) { throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); } + resources.setDeptId(resources.getDept().getId()); return new ResponseEntity<>(jobService.save(resources),HttpStatus.CREATED); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java index c668eb26..ccb9ed41 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java @@ -67,11 +67,9 @@ public class JobServiceImpl extends BaseServiceImpl implements J //@Cacheable public List queryAll(JobQueryCriteria criteria){ List jobList = baseMapper.selectList(QueryHelpPlus.getPredicate(Job.class, criteria)); - List jobScopeList = new ArrayList<>(); if(criteria.getDeptIds().size()==0){ for (Job job : jobList) { job.setDept(deptService.getById(job.getDeptId())); - jobScopeList.add(job); } }else { //断权限范围 @@ -79,12 +77,11 @@ public class JobServiceImpl extends BaseServiceImpl implements J for (Job job : jobList) { if(deptId ==job.getDeptId()){ job.setDept(deptService.getById(job.getDeptId())); - jobScopeList.add(job); } } } } - return jobScopeList; + return jobList; }