11

youxiw2000
1 parent 09bf6aab
Showing 1 changed file with 8 additions and 3 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -113,7 +113,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public LoginVo login(LoginDto loginDto) {
         LoginVo vo = new LoginVo();
-        
+                
         if(loginDto.getSignin() == 1){
         	 QueryWrapper<GarUser> qw = new QueryWrapper<>();
              GarUser nUser = null;
@@ -123,7 +123,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
                 throw new UsernameNotFoundException("当前用户已存在!");
             }
         }
-
+        
         vo.setLoginPhone(loginDto.getTel());
         if (Objects.isNull(loginDto)) {
             throw new UsernameNotFoundException("当前用户不存在!");
@@ -147,12 +147,14 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
         if(loginDto.getCode() == null && loginDto.getPassword() != null){
         	qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
-        	qw.lambda().eq(GarUser::getPassword, new BCryptPasswordEncoder().encode(loginDto.getPassword()));
         	  if(loginDto.getSignin() != 1){
 	            nUser = this.getOne(qw);
 	            if (Objects.isNull(nUser)) {
 	                throw new UsernameNotFoundException("当前用户不存在!");
 	            }
+	            if(!new BCryptPasswordEncoder().matches(loginDto.getPassword(),nUser.getPassword())){
+	            	 throw new UsernameNotFoundException("密码错误!");
+	            }
         	  }
         }else{
         	// 验证码验证
@@ -176,6 +178,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
         }
+        
+
+        
         //是否是投放点用户
         List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel());
         vo.setTestUser(CollectionUtil.isNotEmpty(list));