zhoux 1 год назад
Родитель
Сommit
e8d775ff85

+ 6 - 2
src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -7,7 +7,7 @@
     <sql id="Base_Column_List">
         t.staff_id
         , t.staff_code, t.staff_name,t.staff_phone, t.org_id, t.role_ids,  t.wx_user_id, t.remarks,
-        t.flg_valid,t.flg_can_login,t.hr_status,t.login_type,
+        t.flg_valid,t.flg_can_login,t.hr_status,t.login_type,t.flg_init,
         t.cp_id, t.op_create_time, t.op_create_user_id, t.op_update_time, t.op_update_user_id
     </sql>
 
@@ -40,7 +40,8 @@
         <result column="hr_status" property="hrStatus"/>
         <result column="default_wh_id" property="defaultWhId" typeHandler="UuidTypeHandler" />
         <result column="default_wh_name" property="defaultWhName"/>
-        <result column="grade_code" property="gradeCode"></result>
+        <result column="flg_init" property="flgInit"/>
+        <result column="grade_code" property="gradeCode"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -80,6 +81,9 @@
             <if test="hrStatus != null">
                 AND t.hr_status = #{hrStatus}
             </if>
+            <if test="flgInit != null">
+                AND t.flg_init = #{flgInit}
+            </if>
             <if test="roleIds != null and roleIds.size()>0">
                 AND t.role_ids &amp;&amp;
                 #{roleIds, typeHandler=UuidListTypeHandler}

+ 7 - 0
src/main/java/com/dk/mdm/model/pojo/mst/Staff.java

@@ -207,6 +207,13 @@ public class Staff extends PageInfo<Staff> implements Serializable {
     @ApiModelProperty(value = "登录标识")
     private Integer hrStatus;
 
+    /**
+     * 初始标识
+     */
+    @Excel(name = "初始标识")
+    @ApiModelProperty(value = "初始标识")
+    private Boolean flgInit;
+
     /*
      * 相关属性
      * @TableField(exist = false)

+ 7 - 0
src/main/java/com/dk/mdm/model/query/mst/StaffQuery.java

@@ -222,6 +222,13 @@ public class StaffQuery extends PageInfo<StaffQuery> implements Serializable {
     private Integer hrStatus;
 
     /**
+     * 初始标识
+     */
+    @Excel(name = "初始标识")
+    @ApiModelProperty(value = "初始标识")
+    private Boolean flgInit;
+
+    /**
      * 小程序的查询条件
      */
     @ApiModelProperty(value = "小程序的查询条件")