接口哦1

admin/src/main/java/com/huimv/farm/damsubsidy/common/token/TokenSign.java

@@ -108,6 +108,15 @@ public class TokenSign {
         return (String) claims.get("userName");
     }
 
+    public static String getPhone(HttpServletRequest request) {
+        String jwtToken = request.getHeader("accessToken");
+        if (StringUtils.isBlank(jwtToken)) {
+            return null;
+        }
+        Claims claims = getClaims(jwtToken);
+        return (String) claims.get("phone");
+    }
+
     /**
      * 获取claims对象
      *

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -189,12 +189,11 @@ public class SysUserController {
             accessToken.setLoginIp(user.getLastIp());
             accessToken.setType(user.getUserType());
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("newToken", accessToken);
-            jsonObject.put("user", user);
-            return new Result(ResultCode.SUCCESS, jsonObject);
+            return new Result(ResultCode.SUCCESS, accessToken);
+        } else if (result.getCode() == 10002) {
+            return new Result(ResultCode.UNAUTHENTICATED, "待审核");
         } else {
-            return new Result(ResultCode.FAIL,"用户已实名");
+            return new Result(ResultCode.FAIL, "用户已实名");
         }
     }
 

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

@@ -256,7 +256,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             date = date + " 00:00:00";
         }
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
-        queryWrapper.ge("sub_time", date).like("farmer_name", userName).eq("subsidy_sch",type);
+        queryWrapper.ge(StringUtils.isNotBlank(date),"sub_time", date)
+                .like(StringUtils.isNotBlank(userName),"farmer_name", userName)
+                .eq(StringUtils.isNotBlank(type),"subsidy_sch",type);
         Page<BillSubsidy> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, subsidyMapper.selectPage(page, queryWrapper));
     }

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

@@ -1,10 +1,12 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.PageUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
@@ -53,7 +55,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isEmpty(sysUser)) {
             return new Result(ResultCode.DATA_NULL, "用户暂未注册，请注册！");
         } else {
-            return new Result(ResultCode.SUCCESS, sysUser);
+            if (sysUser.getAccoutType() == 0) {
+                return new Result(ResultCode.FAIL,"未审核！");
+            } else {
+                return new Result(ResultCode.SUCCESS, sysUser);
+            }
         }
     }
 
@@ -140,7 +146,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         if (Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCard"));
+            queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));
             PovertyUserRegist povertyUserRegist = povertyUserRegistMapper.selectOne(queryWrapper);
             if (ObjectUtil.isEmpty(povertyUserRegist)) {
                 user.setFarmType(2);
@@ -150,7 +156,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 user.setFarmType(0);
             }
         }
-        if (paramsMap.get("type") == "2" || paramsMap.get("type") == "3") {
+        if (Integer.parseInt(paramsMap.get("type")) == 2 ||Integer.parseInt(paramsMap.get("type")) == 3) {
             user.setAccoutType(1);
             user.setIsRealName(1);
             QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
@@ -165,7 +171,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (ObjectUtil.isNotEmpty(sysUser)) {
                 return new Result(ResultCode.FAIL, "");
             }
-            userMapper.insert(sysUser);
+            if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
+                return new Result(ResultCode.FAIL, "实名手机号与当前手机号不一致");
+            }
+            userMapper.insert(user);
             return new Result(ResultCode.SUCCESS, userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", paramsMap.get("phone"))));
         } else {
             user.setAccoutType(0);
@@ -182,7 +191,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (ObjectUtil.isNotEmpty(sysUser)) {
                 return new Result(ResultCode.FAIL, "");
             }
-            userMapper.insert(sysUser);
+            if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
+                return new Result(ResultCode.FAIL, "实名手机号与当前手机号不一致");
+            }
+            userMapper.insert(user);
             return new Result(ResultCode.UNAUTHENTICATED,"待审核");
         }
     }
@@ -233,19 +245,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             date = date + " 00:00:00";
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        if (type == "") {
+        if (type==null||type=="") {
             queryWrapper.ge("create_time", date)
-                    .eq("user_type", 0).or().eq("user_type",1).or().eq("user_type",4)
-                    .like("user_name", word).or().like("phone", word)
-                    .or().like("id_card", word);
-        } else if (type == "1") {
-            queryWrapper.eq("accout_type", 0).ge("create_time", date)
-                    .eq("user_type", role).like("user_name", word).or().like("phone", word)
-                    .or().like("id_card", word);
+                    .in("user_type", 0,1,4);
+            queryWrapper.like("user_name", word)
+                            .like("phone", word)
+                            .like("id_card", word);
+            queryWrapper.orderByDesc("create_time");
+        } else if (Integer.parseInt(type)==1) { //待审核
+            queryWrapper.eq("accout_type", 0)
+                    .in("user_type", 0,1,4)
+                    .ge(StringUtils.isNotBlank(date),"create_time", date)
+                    .eq(StringUtils.isNotBlank(role),"user_type", role).
+                    like(StringUtils.isNotBlank(word),"user_name", word).
+                    like(StringUtils.isNotBlank(word),"phone", word)
+                    .like(StringUtils.isNotBlank(word),"id_card", word);
         } else {
-            queryWrapper.ge("accout_type", 0).ge("create_time", date)
-                    .eq("user_type", role).like("user_name", word).or().like("phone", word)
-                    .or().like("id_card", word);
+            queryWrapper.ge("accout_type", 1)
+                    .ge(StringUtils.isNotBlank(date),"create_time", date)
+                    .in("user_type", 0,1,4)
+                    .eq(StringUtils.isNotBlank(role),"user_type", role)
+                    .like(StringUtils.isNotBlank(word),"user_name", word)
+                    .like(StringUtils.isNotBlank(word),"phone", word)
+                    .like(StringUtils.isNotBlank(word),"id_card", word);
         }
         Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, userMapper.selectPage(page, queryWrapper));

admin/src/main/resources/application-dev.yml

@@ -48,5 +48,5 @@ spring:
 
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl