3.5增加登录验证、修改密码、人员列表调整

mitao

2025-03-14 08f1b1f1804a8bd833d42f257908d80e88387b55

 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注解的方法参数注入当前登录用户
 */
@@ -47,19 +49,28 @@
        Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
        if (currentUserId != null) {
            //从数据库中查询并返回
            SysUser sysUser=userService.selectData(currentUserId+"",null);
            SysUser sysUser=userService.selectData(currentUserId+"",null,null);
            if(sysUser!=null)
            {
                return sysUser;
            }

            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
            sysUser=userService.selectData(null,huaChengSysUser.getPhone());
            if(sysUser!=null)
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(currentUserId+"","","");
            HuaChengSysUser huaChengSysUser=null;

            if(list!=null || list.size()>0 )
            {
                return sysUser;
                huaChengSysUser=list.get(0);
            }

            if(huaChengSysUser!=null)
            {
                sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
                if(sysUser!=null)
                {
                    return sysUser;
                }
            }
        }
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);