Merge pull request 'fix:修改短信登录模块_手机号正确的情况下提示用户错误的bug' (#9) from fix/smsLogin_2782 into test

Reviewed-on: #9

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java

@@ -22,6 +22,14 @@ public interface UserTokenService {
      * @return 返回用户数据库对象
      */
     User findByLoginname(String loginname);
+
+    /**
+     * 查询用户对象
+     * @param phone 登录手机号
+     * @return 返回用户数据库对象
+     */
+    User findByPhone(String phone);
+
     /**
      * 查询用户对象
      * @param userid 用户主键

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java

@@ -114,7 +114,7 @@ public class SmsLoginServiceImpl implements SmsLoginService {
         }
     
         //数据库查询用户对象
-        User user = userTokenService.findByLoginname(phone);
+        User user = userTokenService.findByPhone(phone);
         if(null == user){
             return ResultVoUtil.error("用户错误。");
         }

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserService.java

@@ -23,6 +23,13 @@ public interface UserService extends BaseService<User>  {
      * @return 用户对象
      */
     public User findByLoginname(String loginname);
+
+    /**
+     * 根据登录手机号查询用户信息
+     * @param phone 登录手机号
+     * @return 用户对象
+     */
+    public User findByPhone(String phone);
     
     /**
      * 根据主键查询用户信息

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java

@@ -112,6 +112,38 @@ public class UserServiceImpl extends BaseServiceImpl<UserMybatisDao,User>  imple
 		user.setFrontmenuTList(frontmenuTList1);
 		return user;
 	}
+
+	/**
+	 * 根据登录手机号查询用户信息
+	 * @param phone 登录手机号
+	 * @return 用户对象
+	 */
+	@Override
+	public User findByPhone(String phone){
+
+		if(StringUtils.isBlank(phone)){
+			throw new ServiceException(CommonExceptionCodeEnum.PARAM_NOTVALID);
+		}
+
+		QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("MOBILE",phone);
+
+		User user = this.usermybatisdao.selectOne(queryWrapper);
+
+		if(null == user){
+			return null;
+		}
+
+		List<Department> departmentList = this.departmentMybatisDao.selectDeptByUserid(user.getId());
+		user.formatDeptlist(departmentList);
+		user.setTenantList(this.userTenantService.listUserTenant(user.getId()));
+
+		//返回用户前端菜单权限列表
+		List<SFrontmenuT> frontmenuTList1 = isFrontmenuTService.queryUserMenuById(user.getLoginname());
+		user.setFrontmenuTList(frontmenuTList1);
+		return user;
+	}
+
 	/**
 	 * 根据主键查询用户信息
 	 * @param userid

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java

@@ -101,6 +101,24 @@ public class UserTokenServiceImpl implements UserTokenService {
         User user = BeanUtil.copyProperties(userData,User.class);
         return user;
     }
+
+    public User findByPhone(String phone) {
+
+        cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findByPhone(phone);
+
+        if(null == userData){
+            return null;
+        }
+        Department department = this.departmentService.selectRootDepartid(userData.getDepartment());
+        if(null != department){
+            //userData.setDepartname(department.getDepartname());
+            userData.setDepartmentRootId(department.getId());
+        }
+
+        User user = BeanUtil.copyProperties(userData,User.class);
+        return user;
+    }
+
     public User findByUserid(Long userid) {
         
         cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findById(userid);