From b8b62180b00a909415fe54bd362daa6d49142432 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Thu, 25 Mar 2021 15:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserLoginServiceImpl.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index 2f0e3f2c..9b50f501 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -400,7 +400,11 @@ public class UserLoginServiceImpl extends ServiceImpl }else{//客户小程序登录 //如果员工使用客户小程序登录的情况，关联用户表和员工表查询，如果有数据则代表是员工的数据 - if(count2>0 || count <=0){//代表员工或者新用户 + //如果同时为员工和客户的身份，则在客户小程序默认使用客户的身份 + //或者如果仅为客户身份,则在客户小程序默认使用客户的身份 + if((count==2 && count2>0) || (count==1 && count2<1)){ + loginRequest.setPhone(userMap.get("nickName").toString());//账号默认为微信名称 + }else if((count==1 && count2>0) || (count<=0&&count2<=0)){//如果仅为员工身份，或者不是任何身份，则新增一条客户数据到用户表 UserEntity userEntity = new UserEntity(); userEntity.setAccount(userMap.get("nickName").toString());//账号默认为微信名称 userEntity.setWechatId(md5UnionId);//加密后unionId @@ -408,16 +412,6 @@ public class UserLoginServiceImpl extends ServiceImpl userEntity.setCreateTime(new Date());//创建时间 userLoginDao.insert(userEntity); } -/* if(count2>0){//代表员工 - return ResponseResult.FAIL(60002,"您不是客户，请使用员工小程序登录！"); - }else if(count <=0){//新用户 - UserEntity userEntity = new UserEntity(); - userEntity.setAccount(userMap.get("nickName").toString());//账号默认为微信名称 - userEntity.setWechatId(md5UnionId);//加密后unionId - userEntity.setHeadPortaritUrl(userMap.get("avatarUrl").toString());//头像路径 - userEntity.setCreateTime(new Date());//创建时间 - userLoginDao.insert(userEntity); - }*/ }