diff --git a/bonus-business/src/main/java/com/bonus/job/controller/SysJobController.java b/bonus-business/src/main/java/com/bonus/job/controller/SysJobController.java
index 7ce3639..a83fdf5 100644
--- a/bonus-business/src/main/java/com/bonus/job/controller/SysJobController.java
+++ b/bonus-business/src/main/java/com/bonus/job/controller/SysJobController.java
@@ -170,11 +170,11 @@ public class SysJobController extends BaseController
      * 删除定时任务
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
-    @PostMapping("/delete/{jobIds}")
+    @PostMapping("/delete")
     @Log(title = "删除定时任务", businessType = BusinessType.UPDATE)
-    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
+    public AjaxResult remove(@RequestBody SysJob job) throws SchedulerException, TaskException
     {
-        jobService.deleteJobByIds(jobIds);
+        jobService.deleteJob(job);
         return success();
     }
 }
diff --git a/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java b/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java
index 9a18529..02bde77 100644
--- a/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java
@@ -101,7 +101,9 @@ public class WorkerServiceImpl implements WorkerService {
             }
 
             SysDept sysDept = workerMapper.getDeptById(workerVo);
-            workerVo.setOrgId(sysDept.getDeptId().intValue());
+            if (sysDept != null){
+                workerVo.setOrgId(sysDept.getDeptId().intValue());
+            }
             addWorker(workerVo);
         }
         return "导入成功";
diff --git a/bonus-business/src/main/resources/mapper/WorkerMapper.xml b/bonus-business/src/main/resources/mapper/WorkerMapper.xml
index f6ec456..3b0d734 100644
--- a/bonus-business/src/main/resources/mapper/WorkerMapper.xml
+++ b/bonus-business/src/main/resources/mapper/WorkerMapper.xml
@@ -41,9 +41,12 @@
         <if test="orgId!= null " >
             and pw.org_id=#{orgId}
         </if>
-        <if test="workerName!= null " >
+        <if test="workerName!= null and workerName!='' ">
            and pw.worker_name like concat('%', #{workerName}, '%')
         </if>
+        <if test="orgName!= null and orgName!='' ">
+           and sd.dept_name like concat('%', #{orgName}, '%')
+        </if>
         <if test="sex!= null " >
            and pw.sex=#{sex}
         </if>