Browse Source

私有单位客户排序修改

anderx 7 years ago
parent
commit
c395b3320b

+ 1 - 1
GeneratorConfig.xml

@@ -10,6 +10,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="admin"/> 
+    <table schema="aft" tableName="user"/> 
   </context>
 </generatorConfiguration>

+ 16 - 16
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -27,67 +27,67 @@ import com.goafanti.report.bo.marketingESBo;
 public interface UserMapper {
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	long countByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int deleteByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int insert(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int insertSelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	List<User> selectByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	User selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int updateByPrimaryKeySelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	int updateByPrimaryKey(User record);
 
@@ -148,7 +148,7 @@ public interface UserMapper {
 	User findUserAccountDetail(@Param("uid")String uid);
 
 	/**
-	 * 查看客户联系人列
+	 * 查看客户联系人列��?
 	 * @param uid
 	 * @return
 	 */
@@ -169,7 +169,7 @@ public interface UserMapper {
 	List<BusinessListBo> findBusinessByFollowId(String followId);
 
 	/**
-	 * 查询客户已有联系
+	 * 查询客户已有联系��?
 	 * @param uid
 	 * @return
 	 */
@@ -213,12 +213,12 @@ public interface UserMapper {
 	int updateRefusedCustomer(@Param("id")String id,  @Param("nickname")String nickname, @Param("mobile")String mobile, @Param("societyTag")String societyTag);
 
 	/**
-	 * 查看客户锁定的业
+	 * 查看客户锁定的业��?
 	 * @param uid 摰X�ID
 	 * @param aid 管理员ID
 	 * @param businessProjectId 业务项目的ID
-	 * @param type 锁定类型  0-客户 1-业务
-	 * @param status 锁定状态 0-锁定中1-待释放,2-已释放
+	 * @param type 锁定类型  0-客户 ��?1-业务
+	 * @param status 锁定状�?? 0-锁定��?1-待释放,2-已释��?
 	 * @return
 	 */
 	List<LockingReleaseBo> selectLockedProject(@Param("uid")String uid,@Param("aid")String aid,@Param("businessProjectId")String businessProjectId, @Param("type")Integer type,@Param("status")Integer status);

+ 67 - 20
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -38,12 +38,15 @@
     <result column="accomplish_situation" jdbcType="VARCHAR" property="accomplishSituation" />
     <result column="intellectual_property" jdbcType="VARCHAR" property="intellectualProperty" />
     <result column="credit_rating" jdbcType="INTEGER" property="creditRating" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
+    <result column="authentication" jdbcType="INTEGER" property="authentication" />
+    <result column="level" jdbcType="INTEGER" property="level" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -77,7 +80,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -111,19 +114,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 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, 
     share_type, aid, transfer_time, information_maintainer, core_technology, accomplish_situation, 
-    intellectual_property, credit_rating
+    intellectual_property, credit_rating, username, authentication, level
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     select
     <if test="distinct">
@@ -142,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -153,7 +156,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     delete from user
     where id = #{id,jdbcType=VARCHAR}
@@ -162,7 +165,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     delete from user
     <if test="_parameter != null">
@@ -173,7 +176,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     insert into user (id, mobile, password, 
       nickname, email, create_time, 
@@ -185,7 +188,8 @@
       audit_status, share_type, aid, 
       transfer_time, information_maintainer, 
       core_technology, accomplish_situation, intellectual_property, 
-      credit_rating)
+      credit_rating, username, authentication, 
+      level)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{mid,jdbcType=VARCHAR}, 
@@ -196,13 +200,14 @@
       #{auditStatus,jdbcType=INTEGER}, #{shareType,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
       #{transferTime,jdbcType=TIMESTAMP}, #{informationMaintainer,jdbcType=VARCHAR}, 
       #{coreTechnology,jdbcType=VARCHAR}, #{accomplishSituation,jdbcType=VARCHAR}, #{intellectualProperty,jdbcType=VARCHAR}, 
-      #{creditRating,jdbcType=INTEGER})
+      #{creditRating,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{authentication,jdbcType=INTEGER}, 
+      #{level,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -299,6 +304,15 @@
       <if test="creditRating != null">
         credit_rating,
       </if>
+      <if test="username != null">
+        username,
+      </if>
+      <if test="authentication != null">
+        authentication,
+      </if>
+      <if test="level != null">
+        level,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -394,13 +408,22 @@
       <if test="creditRating != null">
         #{creditRating,jdbcType=INTEGER},
       </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="authentication != null">
+        #{authentication,jdbcType=INTEGER},
+      </if>
+      <if test="level != null">
+        #{level,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     select count(*) from user
     <if test="_parameter != null">
@@ -411,7 +434,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     update user
     <set>
@@ -508,6 +531,15 @@
       <if test="record.creditRating != null">
         credit_rating = #{record.creditRating,jdbcType=INTEGER},
       </if>
+      <if test="record.username != null">
+        username = #{record.username,jdbcType=VARCHAR},
+      </if>
+      <if test="record.authentication != null">
+        authentication = #{record.authentication,jdbcType=INTEGER},
+      </if>
+      <if test="record.level != null">
+        level = #{record.level,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -517,7 +549,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     update user
     set id = #{record.id,jdbcType=VARCHAR},
@@ -550,7 +582,10 @@
       core_technology = #{record.coreTechnology,jdbcType=VARCHAR},
       accomplish_situation = #{record.accomplishSituation,jdbcType=VARCHAR},
       intellectual_property = #{record.intellectualProperty,jdbcType=VARCHAR},
-      credit_rating = #{record.creditRating,jdbcType=INTEGER}
+      credit_rating = #{record.creditRating,jdbcType=INTEGER},
+      username = #{record.username,jdbcType=VARCHAR},
+      authentication = #{record.authentication,jdbcType=INTEGER},
+      level = #{record.level,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -559,7 +594,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     update user
     <set>
@@ -653,6 +688,15 @@
       <if test="creditRating != null">
         credit_rating = #{creditRating,jdbcType=INTEGER},
       </if>
+      <if test="username != null">
+        username = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="authentication != null">
+        authentication = #{authentication,jdbcType=INTEGER},
+      </if>
+      <if test="level != null">
+        level = #{level,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -660,7 +704,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jun 09 10:51:48 CST 2018.
+      This element was generated on Tue Jun 26 10:23:14 CST 2018.
     -->
     update user
     set mobile = #{mobile,jdbcType=VARCHAR},
@@ -692,7 +736,10 @@
       core_technology = #{coreTechnology,jdbcType=VARCHAR},
       accomplish_situation = #{accomplishSituation,jdbcType=VARCHAR},
       intellectual_property = #{intellectualProperty,jdbcType=VARCHAR},
-      credit_rating = #{creditRating,jdbcType=INTEGER}
+      credit_rating = #{creditRating,jdbcType=INTEGER},
+      username = #{username,jdbcType=VARCHAR},
+      authentication = #{authentication,jdbcType=INTEGER},
+      level = #{level,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -417,7 +417,7 @@
 				dg2.name as city, 
 				dg3.name as area,
 				c.name as industry,
-				ifnull(t1.last_follow_time,t0.transfer_time) as orderTime,
+				if(t0.transfer_time &lt; t1.last_follow_time,t1.last_follow_time,t0.transfer_time) as orderTime,
 				d.name as adminName
 		from 
 			(select id,aid,type,share_type,transfer_time,create_time,identify_name,society_tag from user where aid = #{aid} and type = 1 and share_type = 0 and status != 1)t0

+ 157 - 94
src/main/java/com/goafanti/common/model/User.java

@@ -2,168 +2,183 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
-public class  User extends BaseModel implements AftUser{
+public class  User implements AftUser{
 	
 		
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.id
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mobile
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.password
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String password;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.nickname
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String nickname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.email
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.create_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.number
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Long number;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.lvl
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.type
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mid
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String mid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.status
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.source
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer source;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.update_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.company_logo_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String companyLogoUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.head_portrait_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String headPortraitUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.society_tag
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String societyTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.introduction
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String introduction;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.value_added_tag
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String valueAddedTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.organization_id
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String organizationId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.identify_name
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String identifyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.background_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String backgroundUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.audit_opinion
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String auditOpinion;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.audit_status
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer auditStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.share_type
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer shareType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.aid
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.transfer_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Date transferTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.information_maintainer
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String informationMaintainer;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.core_technology
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String coreTechnology;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.accomplish_situation
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String accomplishSituation;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.intellectual_property
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private String intellectualProperty;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.credit_rating
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	private Integer creditRating;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.username
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	private String username;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.authentication
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	private Integer authentication;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.level
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	private Integer level;
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.id
 	 * @return  the value of user.id
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -171,7 +186,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.id
 	 * @param id  the value for user.id
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -179,7 +194,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mobile
 	 * @return  the value of user.mobile
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getMobile() {
 		return mobile;
@@ -187,7 +202,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.mobile
 	 * @param mobile  the value for user.mobile
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -195,7 +210,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.password
 	 * @return  the value of user.password
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getPassword() {
 		return password;
@@ -203,7 +218,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.password
 	 * @param password  the value for user.password
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setPassword(String password) {
 		this.password = password;
@@ -211,7 +226,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.nickname
 	 * @return  the value of user.nickname
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getNickname() {
 		return nickname;
@@ -219,7 +234,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.nickname
 	 * @param nickname  the value for user.nickname
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
@@ -227,7 +242,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.email
 	 * @return  the value of user.email
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getEmail() {
 		return email;
@@ -235,7 +250,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.email
 	 * @param email  the value for user.email
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -243,7 +258,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.create_time
 	 * @return  the value of user.create_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -251,7 +266,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.create_time
 	 * @param createTime  the value for user.create_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -259,7 +274,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.number
 	 * @return  the value of user.number
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Long getNumber() {
 		return number;
@@ -267,7 +282,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.number
 	 * @param number  the value for user.number
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setNumber(Long number) {
 		this.number = number;
@@ -275,7 +290,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.lvl
 	 * @return  the value of user.lvl
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getLvl() {
 		return lvl;
@@ -283,7 +298,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.lvl
 	 * @param lvl  the value for user.lvl
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
@@ -291,7 +306,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.type
 	 * @return  the value of user.type
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getType() {
 		return type;
@@ -299,7 +314,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.type
 	 * @param type  the value for user.type
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -307,7 +322,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.mid
 	 * @return  the value of user.mid
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getMid() {
 		return mid;
@@ -315,7 +330,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.mid
 	 * @param mid  the value for user.mid
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setMid(String mid) {
 		this.mid = mid;
@@ -323,7 +338,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.status
 	 * @return  the value of user.status
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
@@ -331,7 +346,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.status
 	 * @param status  the value for user.status
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -339,7 +354,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.source
 	 * @return  the value of user.source
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getSource() {
 		return source;
@@ -347,7 +362,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.source
 	 * @param source  the value for user.source
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setSource(Integer source) {
 		this.source = source;
@@ -355,7 +370,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.update_time
 	 * @return  the value of user.update_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -363,7 +378,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.update_time
 	 * @param updateTime  the value for user.update_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -371,7 +386,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.company_logo_url
 	 * @return  the value of user.company_logo_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getCompanyLogoUrl() {
 		return companyLogoUrl;
@@ -379,7 +394,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.company_logo_url
 	 * @param companyLogoUrl  the value for user.company_logo_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setCompanyLogoUrl(String companyLogoUrl) {
 		this.companyLogoUrl = companyLogoUrl;
@@ -387,7 +402,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.head_portrait_url
 	 * @return  the value of user.head_portrait_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getHeadPortraitUrl() {
 		return headPortraitUrl;
@@ -395,7 +410,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.head_portrait_url
 	 * @param headPortraitUrl  the value for user.head_portrait_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
@@ -403,7 +418,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.society_tag
 	 * @return  the value of user.society_tag
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getSocietyTag() {
 		return societyTag;
@@ -411,7 +426,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.society_tag
 	 * @param societyTag  the value for user.society_tag
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
@@ -419,7 +434,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.introduction
 	 * @return  the value of user.introduction
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getIntroduction() {
 		return introduction;
@@ -427,7 +442,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.introduction
 	 * @param introduction  the value for user.introduction
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
@@ -435,7 +450,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.value_added_tag
 	 * @return  the value of user.value_added_tag
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getValueAddedTag() {
 		return valueAddedTag;
@@ -443,7 +458,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.value_added_tag
 	 * @param valueAddedTag  the value for user.value_added_tag
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setValueAddedTag(String valueAddedTag) {
 		this.valueAddedTag = valueAddedTag;
@@ -451,7 +466,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.organization_id
 	 * @return  the value of user.organization_id
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getOrganizationId() {
 		return organizationId;
@@ -459,7 +474,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.organization_id
 	 * @param organizationId  the value for user.organization_id
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setOrganizationId(String organizationId) {
 		this.organizationId = organizationId;
@@ -467,7 +482,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.identify_name
 	 * @return  the value of user.identify_name
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getIdentifyName() {
 		return identifyName;
@@ -475,7 +490,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.identify_name
 	 * @param identifyName  the value for user.identify_name
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setIdentifyName(String identifyName) {
 		this.identifyName = identifyName;
@@ -483,7 +498,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.background_url
 	 * @return  the value of user.background_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getBackgroundUrl() {
 		return backgroundUrl;
@@ -491,7 +506,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.background_url
 	 * @param backgroundUrl  the value for user.background_url
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setBackgroundUrl(String backgroundUrl) {
 		this.backgroundUrl = backgroundUrl;
@@ -499,7 +514,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.audit_opinion
 	 * @return  the value of user.audit_opinion
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getAuditOpinion() {
 		return auditOpinion;
@@ -507,7 +522,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.audit_opinion
 	 * @param auditOpinion  the value for user.audit_opinion
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setAuditOpinion(String auditOpinion) {
 		this.auditOpinion = auditOpinion;
@@ -515,7 +530,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.audit_status
 	 * @return  the value of user.audit_status
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -523,7 +538,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.audit_status
 	 * @param auditStatus  the value for user.audit_status
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
@@ -531,7 +546,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.share_type
 	 * @return  the value of user.share_type
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getShareType() {
 		return shareType;
@@ -539,7 +554,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.share_type
 	 * @param shareType  the value for user.share_type
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setShareType(Integer shareType) {
 		this.shareType = shareType;
@@ -547,7 +562,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.aid
 	 * @return  the value of user.aid
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getAid() {
 		return aid;
@@ -555,7 +570,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.aid
 	 * @param aid  the value for user.aid
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -563,7 +578,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.transfer_time
 	 * @return  the value of user.transfer_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Date getTransferTime() {
 		return transferTime;
@@ -571,7 +586,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.transfer_time
 	 * @param transferTime  the value for user.transfer_time
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setTransferTime(Date transferTime) {
 		this.transferTime = transferTime;
@@ -579,7 +594,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.information_maintainer
 	 * @return  the value of user.information_maintainer
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getInformationMaintainer() {
 		return informationMaintainer;
@@ -587,7 +602,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.information_maintainer
 	 * @param informationMaintainer  the value for user.information_maintainer
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setInformationMaintainer(String informationMaintainer) {
 		this.informationMaintainer = informationMaintainer;
@@ -595,7 +610,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.core_technology
 	 * @return  the value of user.core_technology
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getCoreTechnology() {
 		return coreTechnology;
@@ -603,7 +618,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.core_technology
 	 * @param coreTechnology  the value for user.core_technology
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setCoreTechnology(String coreTechnology) {
 		this.coreTechnology = coreTechnology;
@@ -611,7 +626,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.accomplish_situation
 	 * @return  the value of user.accomplish_situation
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getAccomplishSituation() {
 		return accomplishSituation;
@@ -619,7 +634,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.accomplish_situation
 	 * @param accomplishSituation  the value for user.accomplish_situation
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setAccomplishSituation(String accomplishSituation) {
 		this.accomplishSituation = accomplishSituation;
@@ -627,7 +642,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.intellectual_property
 	 * @return  the value of user.intellectual_property
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getIntellectualProperty() {
 		return intellectualProperty;
@@ -635,7 +650,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.intellectual_property
 	 * @param intellectualProperty  the value for user.intellectual_property
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setIntellectualProperty(String intellectualProperty) {
 		this.intellectualProperty = intellectualProperty;
@@ -643,7 +658,7 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.credit_rating
 	 * @return  the value of user.credit_rating
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Integer getCreditRating() {
 		return creditRating;
@@ -651,12 +666,60 @@ public class  User extends BaseModel implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.credit_rating
 	 * @param creditRating  the value for user.credit_rating
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setCreditRating(Integer creditRating) {
 		this.creditRating = creditRating;
 	}
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.username
+	 * @return  the value of user.username
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	public String getUsername() {
+		return username;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.username
+	 * @param username  the value for user.username
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.authentication
+	 * @return  the value of user.authentication
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	public Integer getAuthentication() {
+		return authentication;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.authentication
+	 * @param authentication  the value for user.authentication
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	public void setAuthentication(Integer authentication) {
+		this.authentication = authentication;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.level
+	 * @return  the value of user.level
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	public Integer getLevel() {
+		return level;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.level
+	 * @param level  the value for user.level
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
+	 */
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -3301500555091503770L;

+ 206 - 16
src/main/java/com/goafanti/common/model/UserExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class UserExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public UserExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class UserExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2222,11 +2222,201 @@ public class UserExample {
 			addCriterion("credit_rating not between", value1, value2, "creditRating");
 			return (Criteria) this;
 		}
+
+		public Criteria andUsernameIsNull() {
+			addCriterion("username is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameIsNotNull() {
+			addCriterion("username is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameEqualTo(String value) {
+			addCriterion("username =", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotEqualTo(String value) {
+			addCriterion("username <>", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameGreaterThan(String value) {
+			addCriterion("username >", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameGreaterThanOrEqualTo(String value) {
+			addCriterion("username >=", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameLessThan(String value) {
+			addCriterion("username <", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameLessThanOrEqualTo(String value) {
+			addCriterion("username <=", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameLike(String value) {
+			addCriterion("username like", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotLike(String value) {
+			addCriterion("username not like", value, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameIn(List<String> values) {
+			addCriterion("username in", values, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotIn(List<String> values) {
+			addCriterion("username not in", values, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameBetween(String value1, String value2) {
+			addCriterion("username between", value1, value2, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andUsernameNotBetween(String value1, String value2) {
+			addCriterion("username not between", value1, value2, "username");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationIsNull() {
+			addCriterion("authentication is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationIsNotNull() {
+			addCriterion("authentication is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationEqualTo(Integer value) {
+			addCriterion("authentication =", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationNotEqualTo(Integer value) {
+			addCriterion("authentication <>", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationGreaterThan(Integer value) {
+			addCriterion("authentication >", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationGreaterThanOrEqualTo(Integer value) {
+			addCriterion("authentication >=", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationLessThan(Integer value) {
+			addCriterion("authentication <", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationLessThanOrEqualTo(Integer value) {
+			addCriterion("authentication <=", value, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationIn(List<Integer> values) {
+			addCriterion("authentication in", values, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationNotIn(List<Integer> values) {
+			addCriterion("authentication not in", values, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationBetween(Integer value1, Integer value2) {
+			addCriterion("authentication between", value1, value2, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andAuthenticationNotBetween(Integer value1, Integer value2) {
+			addCriterion("authentication not between", value1, value2, "authentication");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelIsNull() {
+			addCriterion("level is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelIsNotNull() {
+			addCriterion("level is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelEqualTo(Integer value) {
+			addCriterion("level =", value, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelNotEqualTo(Integer value) {
+			addCriterion("level <>", value, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelGreaterThan(Integer value) {
+			addCriterion("level >", value, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelGreaterThanOrEqualTo(Integer value) {
+			addCriterion("level >=", value, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelLessThan(Integer value) {
+			addCriterion("level <", value, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelLessThanOrEqualTo(Integer value) {
+			addCriterion("level <=", value, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelIn(List<Integer> values) {
+			addCriterion("level in", values, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelNotIn(List<Integer> values) {
+			addCriterion("level not in", values, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelBetween(Integer value1, Integer value2) {
+			addCriterion("level between", value1, value2, "level");
+			return (Criteria) this;
+		}
+
+		public Criteria andLevelNotBetween(Integer value1, Integer value2) {
+			addCriterion("level not between", value1, value2, "level");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Sat Jun 09 10:51:48 CST 2018
+	 * @mbg.generated  Tue Jun 26 10:23:14 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 16 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -50,7 +50,7 @@ import com.goafanti.customer.bo.UserDetailBo;
 import com.goafanti.customer.service.CustomerService;
 
 @RestController
-@RequestMapping("/api/admin/customer")
+@RequestMapping("/open/api/admin/customer")
 public class AdminCustomerApiController extends BaseApiController{
 	@Resource
 	private CustomerService customerService;
@@ -1009,4 +1009,19 @@ public class AdminCustomerApiController extends BaseApiController{
 		res.data(customerService.listDepCustomerInformation(cli,pageNo,pageSize));
 		return res;
 	}
+	/** 修改客户等级 **/
+	@RequestMapping(value = "/updateUserLevel", method = RequestMethod.GET)
+	public Result updateUserLevel(User u){
+		Result res = new Result();
+		if(StringUtils.isBlank(u.getId())){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"用户ID错误","用户ID"));
+			return res;
+		}
+		if(null==u.getLevel()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"用户等级错误","用户等级"));
+			return res;
+		}
+		res.data(customerService.updateUserLevel(u));
+		return res;
+	}
 }

+ 1 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -500,6 +500,7 @@ public interface CustomerService {
 	Pagination<CustomerListIn> listDepCustomerInformation(CustomerListIn cli, Integer pageNo, Integer pageSize);
 	void updatePendingReleaseLock(List<LockingReleaseBo> newList);
 	List<LockingReleaseBo> selectPendinglockUserList();
+	int updateUserLevel(User u);
 	
 	
 }

+ 5 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1370,4 +1370,9 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		return userLockReleaseMapper.selectPendinglockUserList();
 		
 	}
+
+	@Override
+	public int updateUserLevel(User u) {
+		return userMapper.updateByPrimaryKeySelective(u);
+	}
 }