代码更新

src/main/java/com/qrservice/admin/model/dto/sso/SsoPwdDto.java

@@ -1,5 +1,6 @@
 package com.qrservice.admin.model.dto.sso;
 
+import com.qrservice.admin.model.bussiness.appendix.Contact;
 import lombok.Data;
 
 /**
@@ -16,9 +17,7 @@ public class SsoPwdDto {
 
     private String userStatus;
 
-    private String contactEmail;
-
-    private String contactPhoneNo;
+    private Contact UserContact;
 
     private String userGroup;
 

src/main/java/com/qrservice/admin/service/impl/MerchantTerminalServiceImpl.java

@@ -138,8 +138,8 @@ public class MerchantTerminalServiceImpl implements MerchantTerminalService {
             criteria.orOperator(
                     Criteria.where("alias").regex(".*?"+dto.getKeyWord()+".*"),
                     Criteria.where("merchantId").is(dto.getKeyWord()),
+                    Criteria.where("terminalId").is(dto.getKeyWord()),
                     Criteria.where("storeId").is(dto.getKeyWord()));
-                    Criteria.where("terminalId").is(dto.getKeyWord());
         }
         query.addCriteria(criteria);
         PageImpl<MerchantTerminal> pageInfo = dao.findByPageAndSort(pageable, query);