用户列表中显示实名审核状态

internal/db/models/user_dao.go

@@ -226,7 +226,8 @@ func (this *UserDAO) CountAllEnabledUsers(tx *dbs.Tx, clusterId int64, keyword s
 			Param("keyword", dbutils.QuoteLike(keyword))
 	}
 	if isVerifying {
-		query.Attr("isVerified", 0)
+		query.Where("(isVerified=0 OR (id IN (SELECT userId FROM " + SharedUserIdentityDAO.Table + " WHERE status=:identityStatus AND state=1)))")
+		query.Param("identityStatus", userconfigs.UserIdentityStatusSubmitted)
 	}
 	return query.Count()
 }
@@ -235,7 +236,8 @@ func (this *UserDAO) CountAllEnabledUsers(tx *dbs.Tx, clusterId int64, keyword s
 func (this *UserDAO) CountAllVerifyingUsers(tx *dbs.Tx) (int64, error) {
 	query := this.Query(tx)
 	query.State(UserStateEnabled)
-	query.Attr("isVerified", 0)
+	query.Where("(isVerified=0 OR (id IN (SELECT userId FROM " + SharedUserIdentityDAO.Table + " WHERE status=:identityStatus AND state=1)))")
+	query.Param("identityStatus", userconfigs.UserIdentityStatusSubmitted)
 	return query.Count()
 }
 
@@ -251,7 +253,8 @@ func (this *UserDAO) ListEnabledUsers(tx *dbs.Tx, clusterId int64, keyword strin
 			Param("keyword", dbutils.QuoteLike(keyword))
 	}
 	if isVerifying {
-		query.Attr("isVerified", 0)
+		query.Where("(isVerified=0 OR (id IN (SELECT userId FROM " + SharedUserIdentityDAO.Table + " WHERE status=:identityStatus AND state=1)))")
+		query.Param("identityStatus", userconfigs.UserIdentityStatusSubmitted)
 	}
 	_, err = query.
 		DescPk().

internal/db/models/user_identity_dao.go

@@ -146,7 +146,7 @@ func (this *UserIdentityDAO) RejectUserIdentity(tx *dbs.Tx, identityId int64, re
 	return this.Query(tx).
 		Pk(identityId).
 		Set("status", userconfigs.UserIdentityStatusRejected).
-		Set("rejectedReason", reason).
+		Set("rejectReason", reason).
 		Set("rejectedAt", time.Now().Unix()).
 		UpdateQuickly()
 }
@@ -207,3 +207,12 @@ func (this *UserIdentityDAO) CheckUserIdentityIsVerified(tx *dbs.Tx, userId int6
 		State(UserIdentityStateEnabled).
 		Exist()
 }
+
+// CheckUserIdentityStatus 检查状态
+func (this *UserIdentityDAO) CheckUserIdentityStatus(tx *dbs.Tx, userId int64, status userconfigs.UserIdentityStatus) (bool, error) {
+	return this.Query(tx).
+		Attr("userId", userId).
+		Attr("status", status).
+		State(UserIdentityStateEnabled).
+		Exist()
+}

internal/db/models/user_identity_model.go

@@ -18,7 +18,7 @@ type UserIdentity struct {
 	SubmittedAt  uint64   `field:"submittedAt"`  // 提交时间
 	RejectedAt   uint64   `field:"rejectedAt"`   // 拒绝时间
 	VerifiedAt   uint64   `field:"verifiedAt"`   // 认证时间
-	RejectedReason string   `field:"rejectedReason"` // 拒绝原因
+	RejectReason string   `field:"rejectReason"` // 拒绝原因
 }
 
 type UserIdentityOperator struct {
@@ -36,7 +36,7 @@ type UserIdentityOperator struct {
 	SubmittedAt  interface{} // 提交时间
 	RejectedAt   interface{} // 拒绝时间
 	VerifiedAt   interface{} // 认证时间
-	RejectedReason interface{} // 拒绝原因
+	RejectReason interface{} // 拒绝原因
 }
 
 func NewUserIdentityOperator() *UserIdentityOperator {

internal/rpc/services/service_user_identity.go

@@ -82,7 +82,7 @@ func (this *UserIdentityService) FindEnabledUserIdentity(ctx context.Context, re
 			SubmittedAt:  int64(identity.SubmittedAt),
 			RejectedAt:   int64(identity.RejectedAt),
 			VerifiedAt:   int64(identity.VerifiedAt),
-			RejectedReason: identity.RejectedReason,
+			RejectReason: identity.RejectReason,
 		},
 	}, nil
 }
@@ -122,11 +122,27 @@ func (this *UserIdentityService) FindEnabledUserIdentityWithOrgType(ctx context.
 			SubmittedAt:  int64(identity.SubmittedAt),
 			RejectedAt:   int64(identity.RejectedAt),
 			VerifiedAt:   int64(identity.VerifiedAt),
-			RejectedReason: identity.RejectedReason,
+			RejectReason: identity.RejectReason,
 		},
 	}, nil
 }
 
+// CheckUserIdentityIsSubmitted 检查是否正在审核中
+func (this *UserIdentityService) CheckUserIdentityIsSubmitted(ctx context.Context, req *pb.CheckUserIdentityIsSubmittedRequest) (*pb.CheckUserIdentityIsSubmittedResponse, error) {
+	_, err := this.ValidateAdmin(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	isSubmitted, err := models.SharedUserIdentityDAO.CheckUserIdentityStatus(tx, req.UserId, userconfigs.UserIdentityStatusSubmitted)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CheckUserIdentityIsSubmittedResponse{IsSubmitted: isSubmitted}, nil
+}
+
 // UpdateUserIdentity 修改身份认证信息
 func (this *UserIdentityService) UpdateUserIdentity(ctx context.Context, req *pb.UpdateUserIdentityRequest) (*pb.RPCSuccess, error) {
 	userId, err := this.ValidateUserNode(ctx)