liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '测试' (#213) from feature/cl into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/213
This commit is contained in:
liang.cheng 2023-09-07 16:09:44 +08:00
parent 4387020b06 7dc5ee4fe9
commit 442c4fe200
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
View File

@ -300,7 +300,7 @@
select select
<include refid="baseColumns"/> <include refid="baseColumns"/>
from jcl_org_staffplan t where from jcl_org_staffplan t where
((time_start &lt;= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE} OR (time_end &lt;= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE}) ((time_start &lt;= #{timeStart,jdbcType=DATE} AND time_end >= #{timeStart,jdbcType=DATE}) OR (time_end &lt;= #{timeEnd,jdbcType=DATE} AND time_end >= #{timeEnd,jdbcType=DATE}))
AND ec_company = #{ecCompany} AND ec_company = #{ecCompany}
AND control_dimension = #{controlDimension} AND control_dimension = #{controlDimension}
AND delete_type = 0 AND delete_type = 0

2
src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
View File

@ -212,7 +212,7 @@ public class FunctionOutStaffServiceImpl {
private StaffPO select(StaffOutParam param) { private StaffPO select(StaffOutParam param) {
List<StaffPO> staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob()); List<StaffPO> staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob());
OrganizationAssert.isEmpty(staffPO,"未查询到对应编制方案下的组织编制信息！"); OrganizationAssert.notEmpty(staffPO,"未查询到对应编制方案下的组织编制信息！");
return staffPO.get(0); return staffPO.get(0);
} }