人员信息添加是否后勤和后勤排序号

common/src/main/java/com/jpsoft/shinestar/modules/base/entity/PersonInfo.java

@@ -247,7 +247,7 @@ public class PersonInfo implements Serializable {
     private String carNum;
 
     @ApiModelProperty(value = "后勤人员类别")
-    private String hqType;
+    private String hqStatus;
 
     @ApiModelProperty(value = "后勤排序号")
     private String hqSortNo;

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -44,7 +44,7 @@
         <result property="jobNumber" column="job_number"/>
         <result property="carNum" column="car_num"/>
         <result property="hqSortNo" column="hq_sort_no"/>
-        <result property="hqType" column="hq_type"/>
+        <result property="hqStatus" column="hq_status"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.shinestar.modules.base.entity.PersonInfo">
         <selectKey resultType="long" keyColumn="id_" keyProperty="id">
@@ -56,7 +56,7 @@
 	    app_enabled,password_enabled,guest_enabled,position1_,position2_,
 	    position3_,position4_,position5_,face_image_url,del_flag,
 	    create_by,create_time,update_by,update_time,popedom_,wechat_notice_enabled,allow_view_local,health_ertificate_url,is_sync,sex_,
-	    park_id,work_status,job_number,car_num,hq_sort_no,hq_type)
+	    park_id,work_status,job_number,car_num,hq_sort_no,hq_status)
 		values
 		(
             #{companyId,jdbcType=VARCHAR}
@@ -92,7 +92,7 @@
             ,#{jobNumber,jdbcType=VARCHAR}
             ,#{carNum,jdbcType=VARCHAR}
             ,#{hqSortNo,jdbcType= NUMERIC }
-            ,#{hqType,jdbcType=VARCHAR}
+            ,#{hqStatus,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -204,8 +204,8 @@
             <if test="isHq != null">
                 is_hq = #{isHq,jdbcType=NUMERIC}
             </if>
-            <if test="hqType != null">
-                hq_type = #{hqType,jdbcType=VARCHAR}
+            <if test="hqStatus != null">
+                hq_status = #{hqStatus,jdbcType=VARCHAR}
             </if>
         </set>
         where id_=#{id}
@@ -417,11 +417,7 @@
                 </if>
             </trim>
             <if test="searchParams.hqStatus != null">
-                and a.id_ in(
-                    select person_id from base_hq_person
-                    where find_in_set(hq_status,#{searchParams.hqStatus})>0
-                    and del_flag=0
-                )
+                and a.hq_status = #{searchParams.hqStatus}
             </if>
             <if test="searchParams.querHq != null">
                 and a.id_ in(