java/zhihuishenqu.git

			@@ -95,7 +95,7 @@

			config.setUserType("2");

			SysUser user=IUserService.selectData(null,config.getPhonenumber());
			SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
			if (user != null)
			{
			user.setPassword(config.getPassword());

			@@ -68,7 +68,7 @@
			HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
			if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
			{
			SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone());
			SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
			if(sysUser==null)
			{
			//本地没有此用户新用户

			@@ -47,7 +47,7 @@
			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;
			@@ -56,7 +56,7 @@
			HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
			if(huaChengSysUser!=null)
			{
			sysUser=userService.selectData(null,huaChengSysUser.getPhone());
			sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
			if(sysUser!=null)
			{
			return sysUser;

	flower_city/src/main/java/com/dg/core/controller/GuideDoController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史