liu 1 year ago
parent
commit
f5e3a05b36

+ 6 - 3
src/main/java/com/template/controller/HouseNumberStateController.java

@@ -796,9 +796,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String phone = reserveDto.getPhone();
         LambdaQueryWrapper<Users> wrapperU = new LambdaQueryWrapper<>();
         wrapperU.eq(Users::getUserName, name)
-                .eq(Users::getPhone, phone)
-                .eq(ObjectUtils.isNotEmpty(cardNumber), Users::getCardNumber, cardNumber);
-        Users users = usersService.getOne(wrapperU);
+                .eq(Users::getPhone, phone);
+        List<Users> usersList = usersService.list(wrapperU);
+        Users users=null;
+        if (usersList.size()>0) {
+            users = usersList.get(0);
+        }
 
         if (ObjectUtils.isEmpty(users)) {
             Users users1 = new Users();

+ 2 - 1
src/main/java/com/template/controller/PasswordIssController.java

@@ -219,7 +219,7 @@ public class PasswordIssController {
             String end = sdf.format(Long.valueOf(ciq.getEndTime()));
             unlocking.setStartTime(start);
             unlocking.setEndTime(end);
-//            unlocking.setType("4");
+            unlocking.setType("4");
 
 
             return unlocking;
@@ -362,6 +362,7 @@ public class PasswordIssController {
             String passWord2 = AesUtils.decrypt(temporaryPassword, luid);
             UnlockingAdmin unlocking = new UnlockingAdmin();
             unlocking.setPassWord(passWord);
+
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);