lidongdong
2022-10-26 4edd498948662fcb89c3d3fa539b268b2a17873e
修改登录输错账户报错  bug
7个文件已修改
55 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/UserController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -56,7 +56,14 @@
        if(user==null)
        {
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
            HuaChengSysUser huaChengSysUser=null;
            if(list!=null || list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }
            if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
            {
                //提示用户名或密码错误
flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
@@ -18,7 +18,7 @@
{
    public List<HuaChengSysUser> selectConfigList();
    public HuaChengSysUser selectData(@Param("userId") String userId,@Param("account")  String account,@Param("phone") String phone);
    public List<HuaChengSysUser> selectData(@Param("userId") String userId,@Param("account")  String account,@Param("phone") String phone);
    public int selectNum();
}
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -19,6 +19,7 @@
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.List;
/**
 * 自定义拦截器,判断此次请求是否有权限
@@ -65,7 +66,15 @@
                //如果token验证成功,权限检查通过,将token对应的用户id存在request中,便于之后注入
                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
                System.out.println("花城用户id:"+manager.getHCUserId(HCtoken));
                HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
                List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
                HuaChengSysUser huaChengSysUser=null;
                if(list!=null || list.size()>0 )
                {
                    huaChengSysUser=list.get(0);
                }
                if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
                {
                    SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -16,6 +16,8 @@
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.multipart.support.MissingServletRequestPartException;
import java.util.List;
/**
 * 增加方法注入,将含有CurrentUser注解的方法参数注入当前登录用户
 */
@@ -53,7 +55,14 @@
                return sysUser;
            }
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(currentUserId+"","","");
            HuaChengSysUser huaChengSysUser=null;
            if(list!=null || list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }
            if(huaChengSysUser!=null)
            {
                sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
@@ -8,7 +8,7 @@
{
    public List<HuaChengSysUser> selectConfigList();
    public HuaChengSysUser selectData(String userId,String account,String phone);
    public List<HuaChengSysUser> selectData(String userId,String account,String phone);
    public int selectNum();
}
flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
@@ -18,7 +18,7 @@
    }
    @Override
    public HuaChengSysUser selectData(String userId,String account,String phone) {
    public List<HuaChengSysUser> selectData(String userId,String account,String phone) {
        return baseMapper.selectData(userId,account,phone);
    }
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -65,7 +65,14 @@
        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
        if (sysUser==null){
            //查询花城e+是否存在此用户
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
            HuaChengSysUser huaChengSysUser=null;
            if(list!=null || list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }
            if(huaChengSysUser==null)
            {
                SysUser newUser = new SysUser();
@@ -154,7 +161,14 @@
        SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
        if (sysUser==null){
            //查询花城e+是否存在此用户
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
            HuaChengSysUser huaChengSysUser=null;
            if(list!=null || list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }
            SysUser newUser = new SysUser();
            if(huaChengSysUser==null)
            {