diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml index 81b274ad..f1a760a2 100644 --- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml @@ -300,7 +300,7 @@ select from jcl_org_staffplan t where - ((time_start <= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE} OR (time_end <= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE}) + ((time_start <= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE}) OR (time_end <= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE})) AND ec_company = #{ecCompany} AND control_dimension = #{controlDimension} AND delete_type = 0 diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index 44a08cb8..d78e9fef 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -212,7 +212,7 @@ public class FunctionOutStaffServiceImpl { private StaffPO select(StaffOutParam param) { List staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob()); - OrganizationAssert.isEmpty(staffPO,"未查询到对应编制方案下的组织编制信息!"); + OrganizationAssert.notEmpty(staffPO,"未查询到对应编制方案下的组织编制信息!"); return staffPO.get(0); }