新增字段userName

bonus-business/src/main/java/com/bonus/business/domain/TbFileLabel.java

@@ -45,5 +45,8 @@ public class TbFileLabel extends BaseEntity
     /** 删除状态 */
     private String delFlag;
 
+    /** 用户名称 */
+    private String userName;
+
 
 }

bonus-business/src/main/resources/mapper/business/DockerLabelMapper.xml

@@ -1,53 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.business.mapper.DockerLabelMapper">
     <insert id="addLabel">
-        insert into tb_file_label(
+        insert into tb_file_label(label_name, type_id, type_name, create_time, create_user,
-            label_name,type_id,type_name,create_time,create_user,
+                                  update_user, update_time, del_flag)
-            update_user,update_time,del_flag
+        values (#{labelName}, #{typeId}, #{typeName}, now(), #{createUser}, #{updateUser}, now(), 0)
-        )values (#{labelName},#{typeId},#{typeName},now(),#{createUser},#{updateUser},now(),0)
     </insert>
     <update id="updateLabel">
-        update tb_file_label set
+        update tb_file_label
-          label_name=#{labelName},type_id=#{typeId},type_name=#{typeName}
+        set label_name=#{labelName}
-         ,  update_user =#{updateUser},update_time=now()
+          , type_id=#{typeId}
-        WHERE id=#{id}
+          , type_name=#{typeName}
+          , update_user =#{updateUser}
+          , update_time=now()
+        WHERE id = #{id}
     </update>
     <update id="updateLabelStatus">
-        update   tb_file_label set del_flag=1,  update_user =#{updateUser},update_time=now()
+        update tb_file_label
-        WHERE id=#{id}
+        set del_flag=1,
+            update_user =#{updateUser},
+            update_time=now()
+        WHERE id = #{id}
     </update>
 
     <!--查询下拉选-->
     <select id="selectLabelList" resultType="com.bonus.business.domain.TbFileLabel">
-            select tfl.id,  tfl.label_name  labelName,tfl.type_id typeId,
+        select tfl.id, tfl.label_name labelName,tfl.type_id typeId,
-                   tfl. type_name  typeName, tfl.create_time createTime,
+        tfl. type_name typeName, tfl.create_time createTime,
-                    tfl.create_user ,    tfl.update_user,    tfl.update_time,
+        tfl.create_user , tfl.update_user, tfl.update_time,
-                   su.user_name createUser
+        su.user_id as createUser,su.user_name userName
-            from tb_file_label tfl
+        from tb_file_label tfl
-            left join sys_user su on su.user_id=tfl.create_user
+        left join sys_user su on su.user_id=tfl.create_user
-            where tfl.del_flag=0
+        where tfl.del_flag=0
-            <if test="typeId!=null and typeId!=''">
+        <if test="typeId!=null and typeId!=''">
-                and  tfl.type_id=#{typeId}
+            and tfl.type_id=#{typeId}
-            </if>
+        </if>
-            <if test="labelName!=null and labelName!=''">
+        <if test="labelName!=null and labelName!=''">
-                and tfl.label_name like concat('%',#{labelName},'%')
+            and tfl.label_name like concat('%',#{labelName},'%')
-            </if>
+        </if>
     </select>
     <select id="getLabelNumByName" resultType="java.lang.Integer">
         select count(1)
-        from    tb_file_label
+        from tb_file_label
-        where  del_flag=0 and label_name=#{labelName}
+        where del_flag=0 and label_name=#{labelName}
         <if test="id!=null and id!=''">
-             and id!=#{id}
+            and id!=#{id}
         </if>
 
     </select>
     <select id="getLabelNumById" resultType="java.lang.Integer">
-    select  count(1)
+        select count(1)
-    from tb_document_files_label
+        from tb_document_files_label
-    where label_id=#{id}
+        where label_id = #{id}
     </select>
 </mapper>