生物防控人员

huimv-receive/src/main/java/com/huimv/receive/entity/pojo/UserPagePojo.java

@@ -7,6 +7,7 @@ public class UserPagePojo {
 
     private Integer pageNum;
     private Integer pageSize;
+    private Integer gender;
     private String searchStr;
     private Integer job;
     private String workLocation;

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

@@ -56,11 +56,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public Result pageAll(UserPagePojo userPagePojo) {
-        int pageNum = userPagePojo.getPageNum();
-        int pageSize = userPagePojo.getPageSize();
-        int job = userPagePojo.getJob();
-        int workLocationType = userPagePojo.getWorkLocationType();
+        Integer pageNum = userPagePojo.getPageNum();
+        Integer pageSize = userPagePojo.getPageSize();
+        Integer job = userPagePojo.getJob();
+        Integer workLocationType = userPagePojo.getWorkLocationType();
         String workLocation = userPagePojo.getWorkLocation();
+        Integer gender = userPagePojo.getGender();
         String farmId = userPagePojo.getFarmId();
         String searchStr = userPagePojo.getSearchStr();
 
@@ -71,11 +72,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isEmpty(pageNum) || pageNum<1)
             pageNum = 1;
         if (ObjectUtil.isEmpty(pageSize) || pageSize<1 )
-            pageNum = 10;
+            pageSize = 10;
         wrapper.eq("farm_id",farmId);
         wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
+        wrapper.eq(ObjectUtil.isNotEmpty(gender),"gender",gender);
         if (StringUtils.isNotBlank(searchStr))
             wrapper.and(i -> i.like("user_name",searchStr).or().like("user_phone",searchStr));
         wrapper.orderByDesc("id");
@@ -94,10 +96,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public Result pageAccount(UserPagePojo userPagePojo) {
-        int pageNum = userPagePojo.getPageNum();
-        int pageSize = userPagePojo.getPageSize();
-        int job = userPagePojo.getJob();
-        int workLocationType = userPagePojo.getWorkLocationType();
+        Integer pageNum = userPagePojo.getPageNum();
+        Integer pageSize = userPagePojo.getPageSize();
+        Integer job = userPagePojo.getJob();
+        Integer gender = userPagePojo.getGender();
+        Integer workLocationType = userPagePojo.getWorkLocationType();
         String workLocation = userPagePojo.getWorkLocation();
         String farmId = userPagePojo.getFarmId();
         String searchStr = userPagePojo.getSearchStr();
@@ -114,6 +117,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
+        wrapper.eq(ObjectUtil.isNotEmpty(gender),"gender",gender);
         if (StringUtils.isNotBlank(searchStr))
             wrapper.and(i -> i.like("user_name",searchStr).or().like("user_id",searchStr));