更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/VisitorMainSearch.java

@@ -28,6 +28,12 @@ public class VisitorMainSearch extends SuperSearch {
     @Schema(description = "被访人，也是审核人的用户userId")
     private String visitorUserId;
 
+    @Schema(description = "被访人姓名")
+    private String visitorUserName;
+
+    @Schema(description = "被访人手机")
+    private String visitorUserPhone;
+
     @Schema(description = "是否已失效")
     private Boolean isCancel = Boolean.FALSE;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/visitor/impl/VisitorMainDaoImpl.java

@@ -147,6 +147,14 @@ public class VisitorMainDaoImpl extends BaseImpl implements VisitorMainDaoExtend
             Pattern pattern = Pattern.compile("^.*" + param.getCarNo() + ".*$");
             criterias.add(Criteria.where("carNo").is(pattern));
         }
+        if (StringUtils.isNotEmpty(param.getVisitorUserName())) {
+            Pattern pattern = Pattern.compile("^.*" + param.getVisitorUserName() + ".*$");
+            criterias.add(Criteria.where("visitorUserName").is(pattern));
+        }
+        if (StringUtils.isNotEmpty(param.getVisitorUserPhone())) {
+            Pattern pattern = Pattern.compile("^.*" + param.getVisitorUserPhone() + ".*$");
+            criterias.add(Criteria.where("visitorUserPhone").is(pattern));
+        }
         if (!CollectionUtils.isEmpty(criterias)) {
             criteria.andOperator(criterias.toArray(new Criteria[]{}));
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorMain.java

@@ -56,6 +56,12 @@ public class VisitorMain extends SuperMain {
     @DBRef(lazy = true)
     private UserAccount visitorUserAccount;
 
+    @Schema(description = "被访人姓名")
+    private String visitorUserName;
+
+    @Schema(description = "被访人手机")
+    private String visitorUserPhone;
+
     @Schema(description = "被访人机构用户信息")
     @DBRef(lazy = true)
     private OrganizationUser organizationUser;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -198,6 +198,9 @@ public class VisitorMainService extends SuperPermissService {
         BeanUtils.copyProperties(param, entity);
 
         entity.setVisitorUserAccount(visitorUserAccount);
+        entity.setVisitorUserId(visitorUserAccount.getUserId());
+        entity.setVisitorUserName(visitorUserAccount.getName());
+        entity.setVisitorUserPhone(visitorUserAccount.getPhone());
         entity.setOrganizationUser(organizationUser);
         entity.setStartTime(startTime);
         entity.setEndTime(endTime);
@@ -458,6 +461,7 @@ public class VisitorMainService extends SuperPermissService {
         VisitorMainSearch search = new VisitorMainSearch();
         search.setProjectOid(param.getProjectOid());
         search.setVisitorUserId(userId);
+
         // 待审核 待申批
         search.setState(VisitorState.WaitReView);
         Long waitReViewNumber = visitorMainDao.count(search);