diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java
index 31842d2..3875ebd 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java
@@ -31,6 +31,10 @@ public class KhVote extends BaseEntity
     @Excel(name = "所属评测名称")
     private String pingceName;
 
+    /** 被考核对象类型 */
+    //@Excel(name = "被考核对象类型")
+    private String bkhdxType;
+
     /** 考核项id */
     @Excel(name = "考核项id")
     private Long khitemId;
@@ -100,6 +104,14 @@ public class KhVote extends BaseEntity
         return umax;
     }
 
+    public String getBkhdxType() {
+        return bkhdxType;
+    }
+
+    public void setBkhdxType(String bkhdxType) {
+        this.bkhdxType = bkhdxType;
+    }
+
     public void setUmax(Integer umax) {
         this.umax = umax;
     }
@@ -272,6 +284,7 @@ public class KhVote extends BaseEntity
                 .append("id", getId())
                 .append("pingceId", getPingceId())
                 .append("pingceName", getPingceName())
+                .append("bkxdxType", getBkhdxType())
                 .append("khitemId", getKhitemId())
                 .append("khitemName", getKhitemName())
                 .append("khitemTypeid", getKhitemTypeid())
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
index cac924d..69d6a1c 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
@@ -8,6 +8,7 @@
         <result property="id"    column="id"    />
         <result property="pingceId"    column="pingce_id"    />
         <result property="pingceName"    column="pingce_name"    />
+        <result property="bkhdxType"    column="bkhdx_type"    />
         <result property="khitemId"    column="khitem_id"    />
         <result property="khitemName"    column="khitem_name"    />
         <result property="khitemTypeid"    column="khitem_typeId"    />
@@ -29,14 +30,16 @@
     </resultMap>
 
     <sql id="selectKhVoteVo">
-        select id, pingce_id, pingce_name, khitem_id, khitem_name, khitem_typeId, vote_items, vote_title, v_description, s_time, e_time, max_num, umax, percentage, `state`,same_percent, create_by, create_time, update_by, update_time, remark from kh_vote
+        select id, pingce_id, pingce_name,bkhdx_type, khitem_id, khitem_name, khitem_typeId, vote_items, vote_title, v_description, s_time, e_time, max_num, umax, percentage, `state`,same_percent, create_by, create_time, update_by, update_time, remark from kh_vote
     </sql>
 
     <select id="selectKhVoteList" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
-        <where>
-            <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
-            <if test="pingceName != null  and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
+        <!--left join kh_pingce p on v.pingce_id=p.id-->
+       <where>
+           <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
+           <if test="pingceName != null  and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
+         <!--  <if test="pingceName != null  and pingceName != ''"> and p.bkhdx_type = #{bkhdxType}=</if>-->
             <if test="khitemId != null "> and khitem_id = #{khitemId}</if>
             <if test="khitemName != null  and khitemName != ''"> and khitem_name like concat('%', #{khitemName}, '%')</if>
             <if test="khitemTypeid != null "> and khitem_typeId = #{khitemTypeid}</if>
@@ -52,7 +55,7 @@
             <if test="samePercent != null  and samePercent != ''"> and same_percent = #{samePercent}</if>
         </where>
     </select>
-
+    <!--生成评测账号登录时筛选符合条件的vote展示评分-->
     <select id="getListByPcIdAndItemIds" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
         <where>
@@ -73,7 +76,8 @@
     </select>
 
     <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
-        select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
+        select v.*,it.type_id,p.bkhdx_type from kh_vote v left join kh_items it on   v.khitem_id =it.id
+        left join kh_pingce p on v.pingce_id=p.id
         where v.id = #{id}
     </select>