Commit 48e7252d by qwmqiuwenmin

fix

parent 4a01fc37
......@@ -40,4 +40,6 @@ public interface StaffDepartmentRelatedMapper {
TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByClerkCode(@Param("departmentId")String departmentId, @Param("keyword")String keyword);
}
\ No newline at end of file
......@@ -23,4 +23,6 @@ public interface StaffDepartmentRelatedService {
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId);
int countByDepartmentId(String departmentId);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByClerkCode(String departmentId, String keyword);
}
......@@ -75,5 +75,10 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
return mapper.countByDepartmentId(departmentId);
}
@Override
public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByClerkCode(String departmentId, String keyword) {
return mapper.listByDepartmentIdByClerkCode(departmentId,keyword);
}
}
......@@ -178,7 +178,7 @@ public class StaffApiServiceImpl implements StaffApiService {
@Override
public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo) {
List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentId(departmentId);
List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentIdByClerkCode(departmentId,keyword);
Set<String> staffIds = new HashSet<String>();
for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : list) {
staffIds.add(tabHaobanStaffDepartmentRelated.getStaffId());
......
......@@ -239,4 +239,16 @@
and department_id = #{departmentId}
and status_flag = 1
</select>
<select id="listByDepartmentIdByClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_staff_department_related
where 1
and department_id = #{departmentId}
and status_flag = 1
<if test="keyword != null and keyword != ''">
and clerk_code like CONCAT('%',#{keyword},'%')
</if>
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment