Merge remote-tracking branch 'origin/sit' into sit

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserLogInServiceImpl.java

@@ -97,7 +97,7 @@ public class LawyerUserLogInServiceImpl extends ServiceImpl<LawyerUserMapper, La
     @Override
     public R<LawyerUserVo> register(LawyerUserDto lawyerUserDto) {
         LawyerUser lawyerUser = lawyerUserMapper.selectOne(new LambdaQueryWrapper<LawyerUser>()
-                .eq(LawyerUser::getPhone, lawyerUserDto.getPhone()).last("limit 1"));
+                .eq(LawyerUser::getPhone, lawyerUserDto.getPhone()).eq(LawyerUser::getDeleteFlag, 0).last("limit 1"));
         if (ObjectUtils.isNotEmpty(lawyerUser)) {
             if (lawyerUser.getStatus() == 0) {
                 return R.fail("账号被禁用");