Merge remote-tracking branch 'origin/master'

airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysUser.java

@@ -395,6 +395,12 @@ public class SysUser extends BaseEntity {
     private String subordinateEvaluationGrowthPotential;
 
     /**
+     * 用户标签（多个逗号分隔）
+     */
+    @Excel(name = "用户标签（多个逗号分隔）")
+    private String tags;
+
+    /**
      * 团队配合人员列表
      */
     private List<SysUser> teamCooperationList;
@@ -927,6 +933,14 @@ public class SysUser extends BaseEntity {
         this.workPenaltiesNumber = workPenaltiesNumber;
     }
 
+    public String getTags() {
+        return tags;
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
+
     public List<SysUser> getTeamCooperationList() {
         return teamCooperationList;
     }

airport-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -71,6 +71,7 @@
         <result property="securityInspectionPosition" column="security_inspection_position"/>
         <result property="workRewardsNumber" column="work_rewards_number"/>
         <result property="workPenaltiesNumber" column="work_penalties_number"/>
+        <result property="tags" column="tags"/>
         <association property="dept" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
@@ -157,6 +158,7 @@
                u.security_inspection_position,
                u.work_rewards_number,
                u.work_penalties_number,
+               u.tags,
                d.dept_id,
                d.parent_id,
                d.ancestors,
@@ -197,7 +199,7 @@
         u.schooling,u.political_review_situation,u.start_working_date,
         u.security_check_start_date,u.entry_date,u.xray_operator_starttime,
         u.professional,u.native_place,u.nation,
-        u.security_inspection_position,u.work_rewards_number,u.work_penalties_number,
+        u.security_inspection_position,u.work_rewards_number,u.work_penalties_number,u.tags,
         d.dept_name, d.leader from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
@@ -566,6 +568,9 @@
         <if test="workPenaltiesNumber != null">
             work_penalties_number,
         </if>
+        <if test="tags != null and tags != ''">
+            tags,
+        </if>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -694,6 +699,9 @@
         <if test="workPenaltiesNumber != null">
             #{workPenaltiesNumber},
         </if>
+        <if test="tags != null and tags != ''">
+            #{tags},
+        </if>
         sysdate()
         )
     </insert>
@@ -826,6 +834,9 @@
             <if test="workPenaltiesNumber != null ">
                 work_penalties_number = #{workPenaltiesNumber},
             </if>
+            <if test="tags != null">
+                tags = #{tags},
+            </if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}