代码接口调试提交
This commit is contained in:
parent
de1d9811dd
commit
b03fbd81fa
|
|
@ -170,11 +170,11 @@ public class SysJobController extends BaseController
|
||||||
* 删除定时任务
|
* 删除定时任务
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
||||||
@PostMapping("/delete/{jobIds}")
|
@PostMapping("/delete")
|
||||||
@Log(title = "删除定时任务", businessType = BusinessType.UPDATE)
|
@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();
|
return success();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,9 @@ public class WorkerServiceImpl implements WorkerService {
|
||||||
}
|
}
|
||||||
|
|
||||||
SysDept sysDept = workerMapper.getDeptById(workerVo);
|
SysDept sysDept = workerMapper.getDeptById(workerVo);
|
||||||
|
if (sysDept != null){
|
||||||
workerVo.setOrgId(sysDept.getDeptId().intValue());
|
workerVo.setOrgId(sysDept.getDeptId().intValue());
|
||||||
|
}
|
||||||
addWorker(workerVo);
|
addWorker(workerVo);
|
||||||
}
|
}
|
||||||
return "导入成功";
|
return "导入成功";
|
||||||
|
|
|
||||||
|
|
@ -41,9 +41,12 @@
|
||||||
<if test="orgId!= null " >
|
<if test="orgId!= null " >
|
||||||
and pw.org_id=#{orgId}
|
and pw.org_id=#{orgId}
|
||||||
</if>
|
</if>
|
||||||
<if test="workerName!= null " >
|
<if test="workerName!= null and workerName!='' ">
|
||||||
and pw.worker_name like concat('%', #{workerName}, '%')
|
and pw.worker_name like concat('%', #{workerName}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
<if test="orgName!= null and orgName!='' ">
|
||||||
|
and sd.dept_name like concat('%', #{orgName}, '%')
|
||||||
|
</if>
|
||||||
<if test="sex!= null " >
|
<if test="sex!= null " >
|
||||||
and pw.sex=#{sex}
|
and pw.sex=#{sex}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue