Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0 into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -157,6 +157,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 		for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : list) {
 			staffIds.add(tabHaobanStaffDepartmentRelated.getStaffId());
 		}
+		if(staffIds.isEmpty()) {
+			return new Page<StaffDTO>();
+		}
 		return  PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword),StaffDTO.class);
 	}
 

haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml

@@ -158,6 +158,7 @@
     <include refid="Base_Column_List" />
     from tab_haoban_staff_department_related
     where department_id = #{departmentId,jdbcType=VARCHAR}
+    and status_flag = 1
   </select>
     <select id="getOneByClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select