From 59b47db3bf44873f452df5338a8e5dbe1614d83a Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 18 Feb 2020 16:07:26 +0800
Subject: [PATCH] rollback column last_role_id

---
 .../java/io/metersphere/base/domain/User.java | 10 ---
 .../metersphere/base/domain/UserExample.java  | 70 -------------------
 .../io/metersphere/base/mapper/UserMapper.xml | 27 ++-----
 3 files changed, 5 insertions(+), 102 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/User.java b/backend/src/main/java/io/metersphere/base/domain/User.java
index 8d6a18dd3f..1f57892f2c 100644
--- a/backend/src/main/java/io/metersphere/base/domain/User.java
+++ b/backend/src/main/java/io/metersphere/base/domain/User.java
@@ -19,8 +19,6 @@ public class User implements Serializable {
 
     private String lastSourceId;
 
-    private String lastRoleId;
-
     private static final long serialVersionUID = 1L;
 
     public String getId() {
@@ -86,12 +84,4 @@ public class User implements Serializable {
     public void setLastSourceId(String lastSourceId) {
         this.lastSourceId = lastSourceId == null ? null : lastSourceId.trim();
     }
-
-    public String getLastRoleId() {
-        return lastRoleId;
-    }
-
-    public void setLastRoleId(String lastRoleId) {
-        this.lastRoleId = lastRoleId == null ? null : lastRoleId.trim();
-    }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/domain/UserExample.java b/backend/src/main/java/io/metersphere/base/domain/UserExample.java
index 0d85de3ff4..7fd72a8f11 100644
--- a/backend/src/main/java/io/metersphere/base/domain/UserExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/UserExample.java
@@ -643,76 +643,6 @@ public class UserExample {
             addCriterion("last_source_id not between", value1, value2, "lastSourceId");
             return (Criteria) this;
         }
-
-        public Criteria andLastRoleIdIsNull() {
-            addCriterion("last_role_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdIsNotNull() {
-            addCriterion("last_role_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdEqualTo(String value) {
-            addCriterion("last_role_id =", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdNotEqualTo(String value) {
-            addCriterion("last_role_id <>", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdGreaterThan(String value) {
-            addCriterion("last_role_id >", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdGreaterThanOrEqualTo(String value) {
-            addCriterion("last_role_id >=", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdLessThan(String value) {
-            addCriterion("last_role_id <", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdLessThanOrEqualTo(String value) {
-            addCriterion("last_role_id <=", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdLike(String value) {
-            addCriterion("last_role_id like", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdNotLike(String value) {
-            addCriterion("last_role_id not like", value, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdIn(List<String> values) {
-            addCriterion("last_role_id in", values, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdNotIn(List<String> values) {
-            addCriterion("last_role_id not in", values, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdBetween(String value1, String value2) {
-            addCriterion("last_role_id between", value1, value2, "lastRoleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastRoleIdNotBetween(String value1, String value2) {
-            addCriterion("last_role_id not between", value1, value2, "lastRoleId");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
index a2f56b3b20..2cd87f27e1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
@@ -10,7 +10,6 @@
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="last_source_id" jdbcType="VARCHAR" property="lastSourceId" />
-    <result column="last_role_id" jdbcType="VARCHAR" property="lastRoleId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, email, phone, status, create_time, update_time, last_source_id, last_role_id
+    id, name, email, phone, status, create_time, update_time, last_source_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.UserExample" resultMap="BaseResultMap">
     select
@@ -106,12 +105,10 @@
   <insert id="insert" parameterType="io.metersphere.base.domain.User">
     insert into user (id, name, email, 
       phone, status, create_time, 
-      update_time, last_source_id, last_role_id
-      )
+      update_time, last_source_id)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{phone,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=BIGINT}, #{lastSourceId,jdbcType=VARCHAR}, #{lastRoleId,jdbcType=VARCHAR}
-      )
+      #{updateTime,jdbcType=BIGINT}, #{lastSourceId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.User">
     insert into user
@@ -140,9 +137,6 @@
       <if test="lastSourceId != null">
         last_source_id,
       </if>
-      <if test="lastRoleId != null">
-        last_role_id,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -169,9 +163,6 @@
       <if test="lastSourceId != null">
         #{lastSourceId,jdbcType=VARCHAR},
       </if>
-      <if test="lastRoleId != null">
-        #{lastRoleId,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.UserExample" resultType="java.lang.Long">
@@ -207,9 +198,6 @@
       <if test="record.lastSourceId != null">
         last_source_id = #{record.lastSourceId,jdbcType=VARCHAR},
       </if>
-      <if test="record.lastRoleId != null">
-        last_role_id = #{record.lastRoleId,jdbcType=VARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -224,8 +212,7 @@
       status = #{record.status,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      last_source_id = #{record.lastSourceId,jdbcType=VARCHAR},
-      last_role_id = #{record.lastRoleId,jdbcType=VARCHAR}
+      last_source_id = #{record.lastSourceId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -254,9 +241,6 @@
       <if test="lastSourceId != null">
         last_source_id = #{lastSourceId,jdbcType=VARCHAR},
       </if>
-      <if test="lastRoleId != null">
-        last_role_id = #{lastRoleId,jdbcType=VARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -268,8 +252,7 @@
       status = #{status,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
-      last_source_id = #{lastSourceId,jdbcType=VARCHAR},
-      last_role_id = #{lastRoleId,jdbcType=VARCHAR}
+      last_source_id = #{lastSourceId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file