生物防控人员

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -60,9 +60,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         int pageNum = (Integer)map.get("pageNum");
         int pageSize = (Integer)map.get("pageSize");
         String searchStr = (String)map.get("searchStr");
-        Integer job = (Integer)map.get("job");
-        Integer workLocation = (Integer)map.get("workLocation");
-        String workLocationType = (String)map.get("workLocationType");
+        String job = (String)map.get("job");
+        String workLocation = (String)map.get("workLocation");
+        String workLocationType =(String) map.get("workLocationType");
         String farmId = (String) map.get("farmId");
         if (checkFarm(farmId))
            return new Result(10001,"牧场信息为空",false);
@@ -75,7 +75,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         wrapper.eq("farm_id",farmId);
         wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);
-        wrapper.eq(StringUtils.isNotBlank(workLocationType),"work_location_type",workLocationType);
+        wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
         if (StringUtils.isNotBlank(searchStr))
             wrapper.and(i -> i.like("user_name",searchStr).or().like("user_phone",searchStr));
         wrapper.orderByDesc("id");
@@ -97,8 +97,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         int pageNum = (Integer)map.get("pageNum");
         int pageSize = (Integer)map.get("pageSize");
         String searchStr = (String)map.get("searchStr");
-        Integer job = (Integer)map.get("job");
-        Integer workLocation = (Integer)map.get("workLocation");
+        String job = (String)map.get("job");
+        String workLocation = (String)map.get("workLocation");
         String workLocationType = (String)map.get("workLocationType");
         String farmId = (String) map.get("farmId");
         if (checkFarm(farmId))
@@ -111,7 +111,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //        wrapper.eq("farm_id",farmId);
         wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);
-        wrapper.eq(StringUtils.isNotBlank(workLocationType),"work_location_type",workLocationType);
+        wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
         if (StringUtils.isNotBlank(searchStr))
             wrapper.and(i -> i.like("user_name",searchStr).or().like("user_id",searchStr));