From f6fe0f2190e89b92b9ed25f135685f0da3612048 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sat, 30 May 2020 14:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B2=97=E4=BD=8D=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=B2=A1=E5=85=B3=E8=81=94=E8=BF=9B=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/co/yixiang/modules/system/rest/JobController.java   | 1 +
 .../yixiang/modules/system/service/impl/JobServiceImpl.java  | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

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<JobMapper, Job> implements J
     //@Cacheable
     public List<Job> queryAll(JobQueryCriteria criteria){
         List<Job> jobList = baseMapper.selectList(QueryHelpPlus.getPredicate(Job.class, criteria));
-        List<Job> 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<JobMapper, Job> implements J
                 for (Job job : jobList) {
                     if(deptId ==job.getDeptId()){
                         job.setDept(deptService.getById(job.getDeptId()));
-                        jobScopeList.add(job);
                     }
                 }
             }
         }
-        return jobScopeList;
+        return jobList;
     }