接口1

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -263,7 +263,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (pageNum == null || pageNum == "") {
             pageNum = "1";
         }
-        if (date != "" || date != null) {
+        if (date != "") {
             date = date + " 00:00:00";
         }
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -277,9 +277,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         if (type==null||type=="") {
             if (role == null || role.equals("")) {
-                queryWrapper.eq("user_type", role);
+                queryWrapper.in("user_type", 0,1,4);
             } else {
-                queryWrapper.in("user_type", 0, 1, 4);
+                queryWrapper.eq("user_type", role);
             }
             queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date,paramsMap.get("data")+" 23:59:59");
             queryWrapper.like(StringUtils.isNotBlank(word),"user_name", word)
@@ -288,9 +288,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             queryWrapper.orderByDesc("create_time");
         } else if (Integer.parseInt(type)==1) { //待审核
             if (role == null || role.equals("")) {
-                queryWrapper.eq("user_type", role);
+                queryWrapper.in("user_type", 0,1,4);
             } else {
-                queryWrapper.in("user_type", 0, 1, 4);
+                queryWrapper.eq("user_type", type);
             }
             queryWrapper.eq("accout_type", 0)
                     .between(StringUtils.isNotBlank(date),"create_time", date,paramsMap.get("data")+" 23:59:59")
@@ -300,9 +300,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     .or().like(StringUtils.isNotBlank(word),"id_card", word);
         } else {
             if (role == null || role.equals("")) {
-                queryWrapper.eq("user_type", role);
+                queryWrapper.in("user_type", 0,1,4);
             } else {
-                queryWrapper.in("user_type", 0, 1, 4);
+                queryWrapper.eq("user_type", type);
             }
             queryWrapper.ge("accout_type", 1)
                     .between(StringUtils.isNotBlank(date),"create_time",date,paramsMap.get("data")+" 23:59:59")