staff分页查询调整

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/system/StaffManagerImpl.java

@@ -83,11 +83,11 @@ public class StaffManagerImpl extends RedisCacheManager implements StaffManager
         StaffPageRequest queryRequest = new StaffPageRequest();
         copyProperties(dto, queryRequest);
         //渠道迷糊查出id
-        if (!hasText(dto.getAgencyName())) {
+        if (hasText(dto.getAgencyName())) {
             List<String> agencyIds = agencyRepo.listByName(dto.getAgencyName());
             queryRequest.setAgencyIds(agencyIds);
         }
-        if (!hasText(dto.getServiceHallName())) {
+        if (hasText(dto.getServiceHallName())) {
             List<String> serviceHallIds = qtkServiceHallRepo.listByName(dto.getServiceHallName());
             queryRequest.setServiceHallIds(serviceHallIds);
         }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/repo/jpa/request/system/StaffPageRequest.java

@@ -19,8 +19,6 @@ public class StaffPageRequest extends JpaPageableDataRequest<Staff> {
     private String staffName;// 员工姓名
     private Integer staffType;// 员工类型（默认为1）
     private Integer status;// 状态（默认启用为1，禁用为2）
-    private String serviceHallId;// 网点编号
-    private String agencyId;// 发行渠道
     private String identityType;// 员工身份标识
     private List<String> serviceHallIds;// 网点编号
     private List<String> agencyIds;// 发行渠道