Browse Source

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/aft.git into test

wanghui 7 years ago
parent
commit
31e91c82c9

+ 18 - 16
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -31,7 +31,7 @@
     <result column="audit_opinion" jdbcType="VARCHAR" property="auditOpinion" />
     <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
     <result column="share_type" jdbcType="INTEGER" property="shareType" />
-    <result column="aid" jdbcType="VARCHAR" property="aid" />
+	<result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -108,9 +108,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu May 03 16:11:41 CST 2018.
     -->
-    id, mobile, password, nickname, email, create_time, number, lvl, type, mid, status, 
-    source, update_time, company_logo_url, head_portrait_url, society_tag, introduction, 
-    value_added_tag, organization_id, identify_name, background_url, audit_opinion, audit_status, 
+    id, mobile, password, nickname, email, create_time, number, lvl, type, aid, mid, 
+    status, source, update_time, company_logo_url, head_portrait_url, society_tag, introduction, 
+    value_added_tag, organization_id, share_type,identify_name, background_url, audit_opinion, audit_status, 
     share_type, aid, transfer_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserExample" resultMap="BaseResultMap">
@@ -136,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -147,7 +147,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     delete from user
     where id = #{id,jdbcType=VARCHAR}
@@ -156,7 +156,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     delete from user
     <if test="_parameter != null">
@@ -167,7 +167,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     insert into user (id, mobile, password, 
       nickname, email, create_time, 
@@ -192,7 +192,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu May 03 16:11:41 CST 2018.
+      This element was generated on Thu Nov 30 16:41:39 CST 2017.
     -->
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -426,6 +426,8 @@
       <if test="record.introduction != null">
         introduction = #{record.introduction,jdbcType=VARCHAR},
       </if>
+      
+    
       <if test="record.valueAddedTag != null">
         value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       </if>
@@ -450,6 +452,8 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
+     
+     
       <if test="record.transferTime != null">
         transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
       </if>
@@ -482,6 +486,7 @@
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{record.societyTag,jdbcType=VARCHAR},
       introduction = #{record.introduction,jdbcType=VARCHAR},
+      
       value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       identify_name = #{record.identifyName,jdbcType=VARCHAR},
@@ -551,6 +556,7 @@
       <if test="introduction != null">
         introduction = #{introduction,jdbcType=VARCHAR},
       </if>
+      
       <if test="valueAddedTag != null">
         value_added_tag = #{valueAddedTag,jdbcType=VARCHAR},
       </if>
@@ -575,6 +581,7 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
+      
       <if test="transferTime != null">
         transfer_time = #{transferTime,jdbcType=TIMESTAMP},
       </if>
@@ -1437,9 +1444,8 @@
 			a.type, 
     		a.company_logo_url as companyLogoUrl, 
     		a.head_portrait_url as headPortraitUrl, 
-    		a.introduction, 
-   			a.is_member as isMember,
-   			b.registration_id as registrationId,
+    		a.introduction,
+    		b.registration_id as registrationId,
    			b.easemob_name as easemobName,
    			b.easemob_pass as easemobPass
    		from user a left join jpush_easemob_account b 
@@ -1464,8 +1470,4 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  
-  <select id="selectUserByRoleName" parameterType="java.lang.String" resultMap="BaseResultMap">
-  	select c.id from role a left join user_role b on a.id = b.rid left join admin c on b.uid = c.id where a.role_name = #{roleName}
-  </select>
 </mapper>

+ 5 - 1
src/main/java/com/goafanti/common/model/User.java

@@ -2,9 +2,13 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
-public class  User implements AftUser{
+public class  User  extends BaseModel implements AftUser{
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3301500555091503770L;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.id
 	 * @mbg.generated  Thu May 03 16:11:41 CST 2018
 	 */