接口1211

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

@@ -263,13 +263,13 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (pageNum == null || pageNum == "") {
             pageNum = "1";
         }
-        if (date != "") {
+        if (date != "" || date != null) {
             date = date + " 00:00:00";
         }
 
 
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
-        queryWrapper.between(StringUtils.isNotBlank(date),"sub_time", date,date+" 23:59:59")
+        queryWrapper.between(StringUtils.isNotBlank(date),"sub_time", date,paramsMap.get("date")+" 23:59:59")
                 .like(StringUtils.isNotBlank(userName),"farmer_name", userName);
 
         if (Integer.parseInt(type) == 7) {

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

@@ -60,8 +60,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             if (sysUser.getAccoutType() == 1) {
                 return new Result(ResultCode.SUCCESS, sysUser);
-            } else  {
-                return new Result(10001,"未审核或者账号异常！",false);
+            }else {
+                return new Result(10001, "未审核或者账号异常！", false);
             }
         }
     }
@@ -271,29 +271,41 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (pageNum == null || "".equals(pageNum)) {
             pageNum = "1";
         }
-        if (!"".equals(date)) {
+        if (!"".equals(date) || date == null) {
             date = date + " 00:00:00";
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         if (type==null||type=="") {
-            queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date,date+" 23:59:59")
-                    .in("user_type", 0,1,4);
+            if (role == null || role.equals("")) {
+                queryWrapper.eq("user_type", role);
+            } else {
+                queryWrapper.in("user_type", 0, 1, 4);
+            }
+            queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date,paramsMap.get("data")+" 23:59:59");
             queryWrapper.like(StringUtils.isNotBlank(word),"user_name", word)
                             .or().like(StringUtils.isNotBlank(word),"phone", word)
                             .or().like(StringUtils.isNotBlank(word),"id_card", word);
             queryWrapper.orderByDesc("create_time");
         } else if (Integer.parseInt(type)==1) { //待审核
+            if (role == null || role.equals("")) {
+                queryWrapper.eq("user_type", role);
+            } else {
+                queryWrapper.in("user_type", 0, 1, 4);
+            }
             queryWrapper.eq("accout_type", 0)
-                    .in("user_type", 0,1,4)
-                    .between(StringUtils.isNotBlank(date),"create_time", date,date+" 23:59:59")
+                    .between(StringUtils.isNotBlank(date),"create_time", date,paramsMap.get("data")+" 23:59:59")
                     .eq(StringUtils.isNotBlank(role),"user_type", role).
                     like(StringUtils.isNotBlank(word),"user_name", word)
                     .or().like(StringUtils.isNotBlank(word),"phone", word)
                     .or().like(StringUtils.isNotBlank(word),"id_card", word);
         } else {
+            if (role == null || role.equals("")) {
+                queryWrapper.eq("user_type", role);
+            } else {
+                queryWrapper.in("user_type", 0, 1, 4);
+            }
             queryWrapper.ge("accout_type", 1)
-                    .between(StringUtils.isNotBlank(date),"create_time",date,date+" 23:59:59")
-                    .in("user_type", 0,1,4)
+                    .between(StringUtils.isNotBlank(date),"create_time",date,paramsMap.get("data")+" 23:59:59")
                     .eq(StringUtils.isNotBlank(role),"user_type", role)
                     .like(StringUtils.isNotBlank(word),"user_name", word)
                     .or().like(StringUtils.isNotBlank(word),"phone", word)