Преглед на файлове

fix: 手机号,用户唯一校验

jay преди 2 години
родител
ревизия
98055d9d17
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3 3
      iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

+ 3 - 3
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

@@ -84,7 +84,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         final TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
                 .where(PredicateBuilder.instance()
                         .and(tbSysUser.userName.eq(user.getUserName()))
-                        .and(Objects.nonNull(user.getId()), () -> tbSysUser.id.eq(user.getId()))
+                        .and(Objects.nonNull(user.getId()), () -> tbSysUser.id.ne(user.getId()))
                         .build()).fetchOne();
         return Objects.isNull(ret);
     }
@@ -94,7 +94,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         final TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
                 .where(PredicateBuilder.instance()
                         .and(tbSysUser.phonenumber.eq(user.getPhonenumber()))
-                        .and(Objects.nonNull(user.getId()), () -> tbSysUser.id.eq(user.getId()))
+                        .and(Objects.nonNull(user.getId()), () -> tbSysUser.id.ne(user.getId()))
                         .build()).fetchOne();
         return Objects.isNull(ret);
     }
@@ -119,7 +119,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         final TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
                 .where(PredicateBuilder.instance()
                         .and(tbSysUser.email.eq(user.getEmail()))
-                        .and(Objects.nonNull(user.getId()), () -> tbSysUser.id.eq(user.getId()))
+                        .and(Objects.nonNull(user.getId()), () -> tbSysUser.id.ne(user.getId()))
                         .build()).fetchOne();
         return Objects.isNull(ret);
     }