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

Reviewed-on: #213

src/com/engine/organization/mapper/staff/StaffPlanMapper.xml

@@ -300,7 +300,7 @@
         select
         <include refid="baseColumns"/>
         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 control_dimension = #{controlDimension}
         AND delete_type = 0

src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java

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