wanghui лет назад: 8
Родитель
Сommit
bfd6d61549
24 измененных файлов с 2349 добавлено и 2770 удалено
  1. 1681 1611
      schema/init.sql
  2. 0 52
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  3. 11 11
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  4. 11 11
      src/main/java/com/goafanti/common/dao/UserIdentityMapper.java
  5. 11 11
      src/main/java/com/goafanti/common/dao/UserMapper.java
  6. 0 1
      src/main/java/com/goafanti/common/enums/OrganizationIdentityFields.java
  7. 0 1
      src/main/java/com/goafanti/common/enums/UserIdentityFields.java
  8. 35 50
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  9. 35 51
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  10. 46 53
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  11. 24 24
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  12. 186 209
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  13. 16 86
      src/main/java/com/goafanti/common/model/OrganizationIdentityExample.java
  14. 98 98
      src/main/java/com/goafanti/common/model/User.java
  15. 86 86
      src/main/java/com/goafanti/common/model/UserExample.java
  16. 93 116
      src/main/java/com/goafanti/common/model/UserIdentity.java
  17. 16 86
      src/main/java/com/goafanti/common/model/UserIdentityExample.java
  18. 0 11
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  19. 0 11
      src/main/java/com/goafanti/user/bo/InputUserIdentity.java
  20. 0 13
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java
  21. 0 10
      src/main/java/com/goafanti/user/bo/OrgListBo.java
  22. 0 10
      src/main/java/com/goafanti/user/bo/UserListBo.java
  23. 0 6
      src/main/java/com/goafanti/user/service/UserService.java
  24. 0 152
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

Разница между файлами не показана из-за своего большого размера
+ 1681 - 1611
schema/init.sql


+ 0 - 52
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -464,26 +464,6 @@ public class AdminApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 个人用户列表
-	 */
-	@RequestMapping(value = "/userList", method = RequestMethod.POST)
-	public Result userList(String username, String mobile, String email,
-			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
-			String aftUsername, Integer auditStatus, String pageNo, String pageSize) throws ParseException {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getUserList(username, mobile, email, createTime, number, aftUsername, auditStatus, pNo, pSize));
-		return res;
-	}
-
-	/**
 	 * 个人用户信息明细
 	 */
 	@RequestMapping(value = "/userDetail", method = RequestMethod.POST)
@@ -572,26 +552,6 @@ public class AdminApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 团体用户列表
-	 */
-	@RequestMapping(value = "/orgList", method = RequestMethod.POST)
-	public Result orgList(String uid, String mobile, String email,
-			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number, String unitName,
-			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getOrgList(uid, mobile, email, createTime, number, unitName, auditStatus, pNo, pSize));
-		return res;
-	}
-
-	/**
 	 * 团体用户明细
 	 */
 	@RequestMapping(value = "/orgDetail", method = RequestMethod.POST)
@@ -3016,18 +2976,6 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	// org团体列表
-	private Pagination<OrgListBo> getOrgList(String uid, String mobile, String email, String[] createTime,
-			Integer number, String unitName, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
-		return userService.listOrg(uid, mobile, email, createTime, number, unitName, auditStatus, pNo, pSize);
-	}
-
-	// user个人列表
-	private Pagination<UserListBo> getUserList(String username, String mobile, String email, String[] createTime,
-			Integer number, String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
-		return userService.listUser(username, mobile, email, createTime, number, aftUsername, auditStatus, pNo, pSize);
-	}
-
 	// 高企详情
 	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid, Integer year) {
 		return orgCognizanceService.selectCognizanceDetailBo(uid, cid, year);

+ 11 - 11
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -14,69 +14,69 @@ import org.apache.ibatis.annotations.Param;
 public interface OrganizationIdentityMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	long countByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int deleteByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int insert(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int insertSelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	List<OrganizationIdentity> selectByExample(OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	OrganizationIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") OrganizationIdentity record,
 			@Param("example") OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByExample(@Param("record") OrganizationIdentity record,
 			@Param("example") OrganizationIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByPrimaryKeySelective(OrganizationIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByPrimaryKey(OrganizationIdentity record);
 

+ 11 - 11
src/main/java/com/goafanti/common/dao/UserIdentityMapper.java

@@ -12,67 +12,67 @@ import org.apache.ibatis.annotations.Param;
 public interface UserIdentityMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	long countByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int deleteByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int insert(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int insertSelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	List<UserIdentity> selectByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	UserIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") UserIdentity record, @Param("example") UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByExample(@Param("record") UserIdentity record, @Param("example") UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByPrimaryKeySelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	int updateByPrimaryKey(UserIdentity record);
 

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

@@ -17,67 +17,67 @@ import com.goafanti.customer.bo.CustomerListOut;
 public interface UserMapper {
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	long countByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	int deleteByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	int insert(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	int insertSelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	List<User> selectByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	User selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	int updateByPrimaryKeySelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	int updateByPrimaryKey(User record);
 

+ 0 - 1
src/main/java/com/goafanti/common/enums/OrganizationIdentityFields.java

@@ -11,7 +11,6 @@ public enum OrganizationIdentityFields {
 	QQ("qq", "QQ号"),
 	POSTALADDRESS("postalAddress", "通讯地址"),
 	POSTCODE("postcode", "邮政编码"),
-	AFTUSERNAME("aftUsername", "用户名"),
 	UNITNAME("unitName", "单位名称"),
 	REGISTEREDCAPITAL("registeredCapital", "注册资金"),
 	LICENCENUMBER("licenceNumber", "营业执照注册号"),

+ 0 - 1
src/main/java/com/goafanti/common/enums/UserIdentityFields.java

@@ -12,7 +12,6 @@ public enum UserIdentityFields {
 	IDNUMBER("idNumber", "身份证号"),
 	POSITIVEIDURL("positiveIdUrl", "身份证正面照URL"),
 	OPPOSITEIDURL("oppositeIdUrl", "身份证反面照URL"),
-	AFTUSERNAME("aftUsername", "用户名"),
 	PROVINCE("province", "所在地省"),
 	CITY("city", "所在地市"),
 	AREA("area", "所在地区"),

+ 35 - 50
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.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 Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -15,7 +15,6 @@
     <result column="qq" jdbcType="VARCHAR" property="qq" />
     <result column="postal_address" jdbcType="VARCHAR" property="postalAddress" />
     <result column="postcode" jdbcType="VARCHAR" property="postcode" />
-    <result column="aft_username" jdbcType="VARCHAR" property="aftUsername" />
     <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
     <result column="registered_capital" jdbcType="DECIMAL" property="registeredCapital" />
     <result column="licence_number" jdbcType="VARCHAR" property="licenceNumber" />
@@ -75,7 +74,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -109,7 +108,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -143,10 +142,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
-    id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, aft_username, 
-    unit_name, registered_capital, licence_number, licence_province, licence_city, licence_area, 
+    id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, unit_name, 
+    registered_capital, licence_number, licence_province, licence_city, licence_area, 
     licence_scanning_url, org_code, org_code_url, bank_account, banks, bank_branch, bank_card_number, 
     validation_amount, identity_type, location_province, location_city, location_area, 
     legal_person, legal_person_id_card, last_year_tax_report_url, audit_status, process, 
@@ -161,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     select
     <if test="distinct">
@@ -180,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -191,7 +190,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     delete from organization_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -200,7 +199,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     delete from organization_identity
     <if test="_parameter != null">
@@ -211,18 +210,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     insert into organization_identity (id, uid, contacts, 
       contact_mobile, fixed_tel, qq, 
-      postal_address, postcode, aft_username, 
-      unit_name, registered_capital, licence_number, 
-      licence_province, licence_city, licence_area, 
-      licence_scanning_url, org_code, org_code_url, 
-      bank_account, banks, bank_branch, 
-      bank_card_number, validation_amount, identity_type, 
-      location_province, location_city, location_area, 
-      legal_person, legal_person_id_card, last_year_tax_report_url, 
+      postal_address, postcode, unit_name, 
+      registered_capital, licence_number, licence_province, 
+      licence_city, licence_area, licence_scanning_url, 
+      org_code, org_code_url, bank_account, 
+      banks, bank_branch, bank_card_number, 
+      validation_amount, identity_type, location_province, 
+      location_city, location_area, legal_person, 
+      legal_person_id_card, last_year_tax_report_url, 
       audit_status, process, wrong_count, 
       payment_date, listed, listed_date, 
       listed_type, stock_code, certificate_number, 
@@ -237,14 +236,14 @@
       review_instructions)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactMobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
-      #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{aftUsername,jdbcType=VARCHAR}, 
-      #{unitName,jdbcType=VARCHAR}, #{registeredCapital,jdbcType=DECIMAL}, #{licenceNumber,jdbcType=VARCHAR}, 
-      #{licenceProvince,jdbcType=INTEGER}, #{licenceCity,jdbcType=INTEGER}, #{licenceArea,jdbcType=INTEGER}, 
-      #{licenceScanningUrl,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, #{orgCodeUrl,jdbcType=VARCHAR}, 
-      #{bankAccount,jdbcType=VARCHAR}, #{banks,jdbcType=VARCHAR}, #{bankBranch,jdbcType=VARCHAR}, 
-      #{bankCardNumber,jdbcType=VARCHAR}, #{validationAmount,jdbcType=DECIMAL}, #{identityType,jdbcType=INTEGER}, 
-      #{locationProvince,jdbcType=INTEGER}, #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, 
-      #{legalPerson,jdbcType=VARCHAR}, #{legalPersonIdCard,jdbcType=VARCHAR}, #{lastYearTaxReportUrl,jdbcType=VARCHAR}, 
+      #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, 
+      #{registeredCapital,jdbcType=DECIMAL}, #{licenceNumber,jdbcType=VARCHAR}, #{licenceProvince,jdbcType=INTEGER}, 
+      #{licenceCity,jdbcType=INTEGER}, #{licenceArea,jdbcType=INTEGER}, #{licenceScanningUrl,jdbcType=VARCHAR}, 
+      #{orgCode,jdbcType=VARCHAR}, #{orgCodeUrl,jdbcType=VARCHAR}, #{bankAccount,jdbcType=VARCHAR}, 
+      #{banks,jdbcType=VARCHAR}, #{bankBranch,jdbcType=VARCHAR}, #{bankCardNumber,jdbcType=VARCHAR}, 
+      #{validationAmount,jdbcType=DECIMAL}, #{identityType,jdbcType=INTEGER}, #{locationProvince,jdbcType=INTEGER}, 
+      #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, #{legalPerson,jdbcType=VARCHAR}, 
+      #{legalPersonIdCard,jdbcType=VARCHAR}, #{lastYearTaxReportUrl,jdbcType=VARCHAR}, 
       #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, 
       #{paymentDate,jdbcType=TIMESTAMP}, #{listed,jdbcType=INTEGER}, #{listedDate,jdbcType=TIMESTAMP}, 
       #{listedType,jdbcType=INTEGER}, #{stockCode,jdbcType=VARCHAR}, #{certificateNumber,jdbcType=VARCHAR}, 
@@ -262,7 +261,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     insert into organization_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -290,9 +289,6 @@
       <if test="postcode != null">
         postcode,
       </if>
-      <if test="aftUsername != null">
-        aft_username,
-      </if>
       <if test="unitName != null">
         unit_name,
       </if>
@@ -481,9 +477,6 @@
       <if test="postcode != null">
         #{postcode,jdbcType=VARCHAR},
       </if>
-      <if test="aftUsername != null">
-        #{aftUsername,jdbcType=VARCHAR},
-      </if>
       <if test="unitName != null">
         #{unitName,jdbcType=VARCHAR},
       </if>
@@ -652,7 +645,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     select count(*) from organization_identity
     <if test="_parameter != null">
@@ -663,7 +656,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update organization_identity
     <set>
@@ -691,9 +684,6 @@
       <if test="record.postcode != null">
         postcode = #{record.postcode,jdbcType=VARCHAR},
       </if>
-      <if test="record.aftUsername != null">
-        aft_username = #{record.aftUsername,jdbcType=VARCHAR},
-      </if>
       <if test="record.unitName != null">
         unit_name = #{record.unitName,jdbcType=VARCHAR},
       </if>
@@ -865,7 +855,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update organization_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -876,7 +866,6 @@
       qq = #{record.qq,jdbcType=VARCHAR},
       postal_address = #{record.postalAddress,jdbcType=VARCHAR},
       postcode = #{record.postcode,jdbcType=VARCHAR},
-      aft_username = #{record.aftUsername,jdbcType=VARCHAR},
       unit_name = #{record.unitName,jdbcType=VARCHAR},
       registered_capital = #{record.registeredCapital,jdbcType=DECIMAL},
       licence_number = #{record.licenceNumber,jdbcType=VARCHAR},
@@ -939,7 +928,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update organization_identity
     <set>
@@ -964,9 +953,6 @@
       <if test="postcode != null">
         postcode = #{postcode,jdbcType=VARCHAR},
       </if>
-      <if test="aftUsername != null">
-        aft_username = #{aftUsername,jdbcType=VARCHAR},
-      </if>
       <if test="unitName != null">
         unit_name = #{unitName,jdbcType=VARCHAR},
       </if>
@@ -1136,7 +1122,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:06:53 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update organization_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -1146,7 +1132,6 @@
       qq = #{qq,jdbcType=VARCHAR},
       postal_address = #{postalAddress,jdbcType=VARCHAR},
       postcode = #{postcode,jdbcType=VARCHAR},
-      aft_username = #{aftUsername,jdbcType=VARCHAR},
       unit_name = #{unitName,jdbcType=VARCHAR},
       registered_capital = #{registeredCapital,jdbcType=DECIMAL},
       licence_number = #{licenceNumber,jdbcType=VARCHAR},
@@ -1281,7 +1266,7 @@
 	
 	<select id="selectOrgIdentityDetailByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgIdentityDetailBo">
 		select 
-			id, uid, aft_username as aftUsername, unit_name as unitName, identity_type as identityType,
+			id, uid, unit_name as unitName, identity_type as identityType,
 			legal_person as legalPerson, legal_person_id_card as legalPersonIdCard, registration_time as registrationTime,
 			licence_number as licenceNumber, licence_province as licenceProvince, licence_city as licenceCity,
 			licence_area as licenceArea, licence_scanning_url as licenceScanningUrl, org_code as orgCode,
@@ -1297,7 +1282,7 @@
 	<select id="selectAuditorOrgIdentityDetailByUserId" resultType="com.goafanti.user.bo.AuditorOrgIdentityDetailBo">
 		select  
 			 u.aid, u.mid, u.lvl,
-			 oi.id, oi.uid,  oi.aft_username as aftUsername,  oi.unit_name as unitName,  oi.identity_type as identityType,
+			 oi.id, oi.uid, oi.unit_name as unitName,  oi.identity_type as identityType,
 			 oi.legal_person as legalPerson,  oi.legal_person_id_card as legalPersonIdCard,  oi.registration_time as registrationTime,
 			 oi.licence_number as licenceNumber,  oi.licence_province as licenceProvince,  oi.licence_city as licenceCity,
 			 oi.licence_area as licenceArea,  oi.licence_scanning_url as licenceScanningUrl,  oi.org_code as orgCode,

+ 35 - 51
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.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 Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -16,7 +16,6 @@
     <result column="id_number" jdbcType="VARCHAR" property="idNumber" />
     <result column="positive_id_url" jdbcType="VARCHAR" property="positiveIdUrl" />
     <result column="opposite_id_url" jdbcType="VARCHAR" property="oppositeIdUrl" />
-    <result column="aft_username" jdbcType="VARCHAR" property="aftUsername" />
     <result column="province" jdbcType="INTEGER" property="province" />
     <result column="city" jdbcType="INTEGER" property="city" />
     <result column="area" jdbcType="INTEGER" property="area" />
@@ -44,7 +43,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -78,7 +77,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -112,19 +111,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     id, uid, username, sex, date_of_birth_year, date_of_birth_month, id_number, positive_id_url, 
-    opposite_id_url, aft_username, province, city, area, contact_mobile, bank_name, bank_account, 
-    bank_card_number, amount_money, audit_status, process, wrong_count, payment_date, 
-    expert, celebrity, international, fixed_tel, qq, postal_address, postcode, review_instructions, 
-    industry, contacts
+    opposite_id_url, province, city, area, contact_mobile, bank_name, bank_account, bank_card_number, 
+    amount_money, audit_status, process, wrong_count, payment_date, expert, celebrity, 
+    international, fixed_tel, qq, postal_address, postcode, review_instructions, industry, 
+    contacts
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     select
     <if test="distinct">
@@ -143,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -154,7 +153,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     delete from user_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -163,7 +162,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     delete from user_identity
     <if test="_parameter != null">
@@ -174,36 +173,36 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     insert into user_identity (id, uid, username, 
       sex, date_of_birth_year, date_of_birth_month, 
       id_number, positive_id_url, opposite_id_url, 
-      aft_username, province, city, 
-      area, contact_mobile, bank_name, 
-      bank_account, bank_card_number, amount_money, 
-      audit_status, process, wrong_count, 
-      payment_date, expert, celebrity, 
-      international, fixed_tel, qq, 
-      postal_address, postcode, review_instructions, 
-      industry, contacts)
+      province, city, area, 
+      contact_mobile, bank_name, bank_account, 
+      bank_card_number, amount_money, audit_status, 
+      process, wrong_count, payment_date, 
+      expert, celebrity, international, 
+      fixed_tel, qq, postal_address, 
+      postcode, review_instructions, industry, 
+      contacts)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
-      #{aftUsername,jdbcType=VARCHAR}, #{province,jdbcType=INTEGER}, #{city,jdbcType=INTEGER}, 
-      #{area,jdbcType=INTEGER}, #{contactMobile,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
-      #{bankAccount,jdbcType=VARCHAR}, #{bankCardNumber,jdbcType=VARCHAR}, #{amountMoney,jdbcType=DECIMAL}, 
-      #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, 
-      #{paymentDate,jdbcType=TIMESTAMP}, #{expert,jdbcType=INTEGER}, #{celebrity,jdbcType=INTEGER}, 
-      #{international,jdbcType=INTEGER}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
-      #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{reviewInstructions,jdbcType=VARCHAR}, 
-      #{industry,jdbcType=INTEGER}, #{contacts,jdbcType=VARCHAR})
+      #{province,jdbcType=INTEGER}, #{city,jdbcType=INTEGER}, #{area,jdbcType=INTEGER}, 
+      #{contactMobile,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, #{bankAccount,jdbcType=VARCHAR}, 
+      #{bankCardNumber,jdbcType=VARCHAR}, #{amountMoney,jdbcType=DECIMAL}, #{auditStatus,jdbcType=INTEGER}, 
+      #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, #{paymentDate,jdbcType=TIMESTAMP}, 
+      #{expert,jdbcType=INTEGER}, #{celebrity,jdbcType=INTEGER}, #{international,jdbcType=INTEGER}, 
+      #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
+      #{postcode,jdbcType=VARCHAR}, #{reviewInstructions,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, 
+      #{contacts,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     insert into user_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -234,9 +233,6 @@
       <if test="oppositeIdUrl != null">
         opposite_id_url,
       </if>
-      <if test="aftUsername != null">
-        aft_username,
-      </if>
       <if test="province != null">
         province,
       </if>
@@ -332,9 +328,6 @@
       <if test="oppositeIdUrl != null">
         #{oppositeIdUrl,jdbcType=VARCHAR},
       </if>
-      <if test="aftUsername != null">
-        #{aftUsername,jdbcType=VARCHAR},
-      </if>
       <if test="province != null">
         #{province,jdbcType=INTEGER},
       </if>
@@ -407,7 +400,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     select count(*) from user_identity
     <if test="_parameter != null">
@@ -418,7 +411,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update user_identity
     <set>
@@ -449,9 +442,6 @@
       <if test="record.oppositeIdUrl != null">
         opposite_id_url = #{record.oppositeIdUrl,jdbcType=VARCHAR},
       </if>
-      <if test="record.aftUsername != null">
-        aft_username = #{record.aftUsername,jdbcType=VARCHAR},
-      </if>
       <if test="record.province != null">
         province = #{record.province,jdbcType=INTEGER},
       </if>
@@ -527,7 +517,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update user_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -539,7 +529,6 @@
       id_number = #{record.idNumber,jdbcType=VARCHAR},
       positive_id_url = #{record.positiveIdUrl,jdbcType=VARCHAR},
       opposite_id_url = #{record.oppositeIdUrl,jdbcType=VARCHAR},
-      aft_username = #{record.aftUsername,jdbcType=VARCHAR},
       province = #{record.province,jdbcType=INTEGER},
       city = #{record.city,jdbcType=INTEGER},
       area = #{record.area,jdbcType=INTEGER},
@@ -570,7 +559,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update user_identity
     <set>
@@ -598,9 +587,6 @@
       <if test="oppositeIdUrl != null">
         opposite_id_url = #{oppositeIdUrl,jdbcType=VARCHAR},
       </if>
-      <if test="aftUsername != null">
-        aft_username = #{aftUsername,jdbcType=VARCHAR},
-      </if>
       <if test="province != null">
         province = #{province,jdbcType=INTEGER},
       </if>
@@ -674,7 +660,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 11:58:34 CST 2017.
+      This element was generated on Sun Nov 12 10:00:10 CST 2017.
     -->
     update user_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -685,7 +671,6 @@
       id_number = #{idNumber,jdbcType=VARCHAR},
       positive_id_url = #{positiveIdUrl,jdbcType=VARCHAR},
       opposite_id_url = #{oppositeIdUrl,jdbcType=VARCHAR},
-      aft_username = #{aftUsername,jdbcType=VARCHAR},
       province = #{province,jdbcType=INTEGER},
       city = #{city,jdbcType=INTEGER},
       area = #{area,jdbcType=INTEGER},
@@ -740,7 +725,6 @@
   		ui.id_number as idNumber, 
   		ui.positive_id_url as positiveIdUrl,
   		ui.opposite_id_url as oppositeIdUrl, 
-  		ui.aft_username as aftUsername, 
   		ui.province, 
   		ui.city, 
   		ui.area, 

+ 46 - 53
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 Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -24,7 +24,6 @@
     <result column="company_logo_url" jdbcType="VARCHAR" property="companyLogoUrl" />
     <result column="head_portrait_url" jdbcType="VARCHAR" property="headPortraitUrl" />
     <result column="society_tag" jdbcType="VARCHAR" property="societyTag" />
-    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="introduction" jdbcType="VARCHAR" property="introduction" />
     <result column="service_certification" jdbcType="INTEGER" property="serviceCertification" />
     <result column="user_certification" jdbcType="INTEGER" property="userCertification" />
@@ -33,12 +32,13 @@
     <result column="value_added_tag" jdbcType="VARCHAR" property="valueAddedTag" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="share_type" jdbcType="INTEGER" property="shareType" />
+    <result column="identify_name" jdbcType="VARCHAR" property="identifyName" />
   </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 Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -72,7 +72,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -106,18 +106,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     id, mobile, password, nickname, email, create_time, number, lvl, type, aid, mid, 
-    status, source, update_time, company_logo_url, head_portrait_url, society_tag, company_name, 
-    introduction, service_certification, user_certification, last_member_order_id, current_member_status, 
-    value_added_tag, organization_id, share_type
+    status, source, update_time, company_logo_url, head_portrait_url, society_tag, introduction, 
+    service_certification, user_certification, last_member_order_id, current_member_status, 
+    value_added_tag, organization_id, share_type, identify_name
   </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 Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     select
     <if test="distinct">
@@ -136,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 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 Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 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 Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     delete from user
     <if test="_parameter != null">
@@ -167,34 +167,32 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     insert into user (id, mobile, password, 
       nickname, email, create_time, 
       number, lvl, type, aid, 
       mid, status, source, 
       update_time, company_logo_url, head_portrait_url, 
-      society_tag, company_name, introduction, 
-      service_certification, user_certification, 
-      last_member_order_id, current_member_status, 
-      value_added_tag, organization_id, share_type
-      )
+      society_tag, introduction, service_certification, 
+      user_certification, last_member_order_id, current_member_status, 
+      value_added_tag, organization_id, share_type, 
+      identify_name)
     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}, #{aid,jdbcType=VARCHAR}, 
       #{mid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{source,jdbcType=INTEGER}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{companyLogoUrl,jdbcType=VARCHAR}, #{headPortraitUrl,jdbcType=VARCHAR}, 
-      #{societyTag,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, 
-      #{serviceCertification,jdbcType=INTEGER}, #{userCertification,jdbcType=INTEGER}, 
-      #{lastMemberOrderId,jdbcType=VARCHAR}, #{currentMemberStatus,jdbcType=INTEGER}, 
-      #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{shareType,jdbcType=INTEGER}
-      )
+      #{societyTag,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{serviceCertification,jdbcType=INTEGER}, 
+      #{userCertification,jdbcType=INTEGER}, #{lastMemberOrderId,jdbcType=VARCHAR}, #{currentMemberStatus,jdbcType=INTEGER}, 
+      #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{shareType,jdbcType=INTEGER}, 
+      #{identifyName,jdbcType=VARCHAR})
   </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 Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -249,9 +247,6 @@
       <if test="societyTag != null">
         society_tag,
       </if>
-      <if test="companyName != null">
-        company_name,
-      </if>
       <if test="introduction != null">
         introduction,
       </if>
@@ -276,6 +271,9 @@
       <if test="shareType != null">
         share_type,
       </if>
+      <if test="identifyName != null">
+        identify_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -329,9 +327,6 @@
       <if test="societyTag != null">
         #{societyTag,jdbcType=VARCHAR},
       </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
-      </if>
       <if test="introduction != null">
         #{introduction,jdbcType=VARCHAR},
       </if>
@@ -356,13 +351,16 @@
       <if test="shareType != null">
         #{shareType,jdbcType=INTEGER},
       </if>
+      <if test="identifyName != null">
+        #{identifyName,jdbcType=VARCHAR},
+      </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 Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     select count(*) from user
     <if test="_parameter != null">
@@ -373,7 +371,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     update user
     <set>
@@ -428,9 +426,6 @@
       <if test="record.societyTag != null">
         society_tag = #{record.societyTag,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyName != null">
-        company_name = #{record.companyName,jdbcType=VARCHAR},
-      </if>
       <if test="record.introduction != null">
         introduction = #{record.introduction,jdbcType=VARCHAR},
       </if>
@@ -455,6 +450,9 @@
       <if test="record.shareType != null">
         share_type = #{record.shareType,jdbcType=INTEGER},
       </if>
+      <if test="record.identifyName != null">
+        identify_name = #{record.identifyName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -464,7 +462,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     update user
     set id = #{record.id,jdbcType=VARCHAR},
@@ -484,7 +482,6 @@
       company_logo_url = #{record.companyLogoUrl,jdbcType=VARCHAR},
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{record.societyTag,jdbcType=VARCHAR},
-      company_name = #{record.companyName,jdbcType=VARCHAR},
       introduction = #{record.introduction,jdbcType=VARCHAR},
       service_certification = #{record.serviceCertification,jdbcType=INTEGER},
       user_certification = #{record.userCertification,jdbcType=INTEGER},
@@ -492,7 +489,8 @@
       current_member_status = #{record.currentMemberStatus,jdbcType=INTEGER},
       value_added_tag = #{record.valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
-      share_type = #{record.shareType,jdbcType=INTEGER}
+      share_type = #{record.shareType,jdbcType=INTEGER},
+      identify_name = #{record.identifyName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -501,7 +499,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     update user
     <set>
@@ -553,9 +551,6 @@
       <if test="societyTag != null">
         society_tag = #{societyTag,jdbcType=VARCHAR},
       </if>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
-      </if>
       <if test="introduction != null">
         introduction = #{introduction,jdbcType=VARCHAR},
       </if>
@@ -580,6 +575,9 @@
       <if test="shareType != null">
         share_type = #{shareType,jdbcType=INTEGER},
       </if>
+      <if test="identifyName != null">
+        identify_name = #{identifyName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -587,7 +585,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Nov 11 13:33:03 CST 2017.
+      This element was generated on Sun Nov 12 10:11:30 CST 2017.
     -->
     update user
     set mobile = #{mobile,jdbcType=VARCHAR},
@@ -606,7 +604,6 @@
       company_logo_url = #{companyLogoUrl,jdbcType=VARCHAR},
       head_portrait_url = #{headPortraitUrl,jdbcType=VARCHAR},
       society_tag = #{societyTag,jdbcType=VARCHAR},
-      company_name = #{companyName,jdbcType=VARCHAR},
       introduction = #{introduction,jdbcType=VARCHAR},
       service_certification = #{serviceCertification,jdbcType=INTEGER},
       user_certification = #{userCertification,jdbcType=INTEGER},
@@ -614,7 +611,8 @@
       current_member_status = #{currentMemberStatus,jdbcType=INTEGER},
       value_added_tag = #{valueAddedTag,jdbcType=VARCHAR},
       organization_id = #{organizationId,jdbcType=VARCHAR},
-      share_type = #{shareType,jdbcType=INTEGER}
+      share_type = #{shareType,jdbcType=INTEGER},
+      identify_name = #{identifyName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  
@@ -678,7 +676,6 @@
   		u.email, 
   		u.create_time as createTime, 
   	    u.number , 
-  	    i.aft_username as aftUsername, 
   	    i.username,
   	    i.audit_status as auditStatus, 
   	    a.name as adminName,
@@ -745,7 +742,7 @@
   
   <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
   select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.aft_username as aftUsername, o.audit_status as orgAuditStatus, a.name as adminName,
+  	       u.number, o.audit_status as orgAuditStatus, a.name as adminName,
   	       o.unit_name as unitName, ad.name as managerName
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
@@ -826,8 +823,7 @@
   	    ma.name as managerName, 
   	    u.type,
   	    i.username, 
-  	    i.audit_status as userAuditStatus,
-  	    i.aft_username as aftUsername
+  	    i.audit_status as userAuditStatus
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
     LEFT JOIN admin ma on ma.id = u.mid 
@@ -908,8 +904,7 @@
   	    ma.name as managerName, 
   	    u.type,
   	    i.unit_name as unitName, 
-  	    i.audit_status as orgAuditStatus,
-  	    i.aft_username as aftUsername
+  	    i.audit_status as orgAuditStatus
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
     LEFT JOIN admin ma on ma.id = u.mid 
@@ -1015,7 +1010,6 @@
   		u.email, 
   		u.create_time as createTime, 
   	    u.number , 
-  	    i.aft_username as aftUsername, 
   	    i.audit_status as auditStatus, 
   	    i.username,
   	    a.name as adminName,
@@ -1114,7 +1108,6 @@
   		u.email, 
   		u.create_time as createTime, 
   	    u.number , 
-  	    o.aft_username as aftUsername, 
   	    o.audit_status as orgAuditStatus, 
   	    a.name as adminName,
   	    o.unit_name as unitName, 

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

@@ -5,19 +5,19 @@
 		<choose>
 			<when test="type == 0">
 				select  
-					a.id as uid,a.type,a.status, a.create_time as createTime,a.service_certification as serviceCertification,
-					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,
-					b.username as name,b.contacts,b.contact_mobile as contactMobile,b.international,b.expert,b.celebrity,
+					a.id as uid,a.type,a.status, date_format(a.create_time,'%Y-%c-%d %h:%i:%s') as createTime,a.service_certification as serviceCertification,
+					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,a.identify_name as name,a.lvl,
+					b.contacts,b.contact_mobile as contactMobile,b.international,b.expert,b.celebrity,
 					dg1.name as province,dg2.name as city, dg3.name as area,c.name as industry
 				from 
 				(select 
-					id,type,status,create_time,service_certification,user_certification,current_member_status
+					id,type,status,create_time,service_certification,user_certification,current_member_status,identify_name,lvl
 				from user
 					where type = 0
 					<if test="aid != null and aid !=''">
 						and aid = #{aid,jdbcType=VARCHAR}
 					</if>
-					<if test="shareType != null and shareType !=''">
+					<if test="shareType != null">
 						and share_type = #{shareType,jdbcType=VARCHAR}
 					</if>				
 					<if test="status != null">
@@ -62,19 +62,19 @@
 			</when>
 			<when test="type == 1">
 				select  
-					a.id as uid,a.type,a.status, a.create_time as createTime,a.service_certification as serviceCertification,
-					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,
-					b.unit_name as name,b.contacts,b.contact_mobile as contactMobile,b.international,0 as expert,0 as celebrity,
+					a.id as uid,a.type,a.status, date_format(a.create_time,'%Y-%c-%d %h:%i:%s') as createTime,a.service_certification as serviceCertification,
+					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,a.identify_name as name,a.lvl,
+					b.contacts,b.contact_mobile as contactMobile,b.international,0 as expert,0 as celebrity,
 					dg1.name as province,dg2.name as city, dg3.name as area,c.name as industry
 				from 
 				(select 
-					id,type,status,create_time,service_certification,user_certification,current_member_status
+					id,type,status,create_time,service_certification,user_certification,current_member_status,identify_name,lvl
 				from user
 					where type = 1
 					<if test="aid != null and aid !=''">
 						and aid = #{aid,jdbcType=VARCHAR}
 					</if>
-					<if test="shareType != null and shareType !=''">
+					<if test="shareType != null">
 						and share_type = #{shareType,jdbcType=VARCHAR}
 					</if>				
 					<if test="status != null">
@@ -120,19 +120,19 @@
 			<otherwise>
 			select * from (
 				select  
-					a.id as uid,a.type,a.status, a.create_time as createTime,a.service_certification as serviceCertification,
-					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,
-					b.username as name,b.contacts,b.contact_mobile as contactMobile,b.international,b.expert,b.celebrity,
+					a.id as uid,a.type,a.status, date_format(a.create_time,'%Y-%c-%d %h:%i:%s') as createTime,a.service_certification as serviceCertification,
+					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,a.identify_name as name,a.lvl,
+					b.contacts,b.contact_mobile as contactMobile,b.international,b.expert,b.celebrity,
 					dg1.name as province,dg2.name as city, dg3.name as area,c.name as industry
 				from 
 				(select 
-					id,type,status,create_time,service_certification,user_certification,current_member_status
+					id,type,status,create_time,service_certification,user_certification,current_member_status,identify_name,lvl
 				from user
 					where type = 0
 					<if test="aid != null and aid !=''">
 						and aid = #{aid,jdbcType=VARCHAR}
 					</if>
-					<if test="shareType != null and shareType !=''">
+					<if test="shareType != null">
 						and share_type = #{shareType,jdbcType=VARCHAR}
 					</if>					
 					<if test="status != null">
@@ -176,19 +176,19 @@
 				</if>
 				union
 				select  
-					a.id as uid,a.type,a.status, a.create_time as createTime,a.service_certification as serviceCertification,
-					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,
-					b.unit_name as name,b.contacts,b.contact_mobile as contactMobile,b.international,0 as expert,0 as celebrity,
+					a.id as uid,a.type,a.status, date_format(a.create_time,'%Y-%c-%d %h:%i:%s') as createTime,a.service_certification as serviceCertification,
+					a.user_certification as userCertification,a.current_member_status as currentMemberStatus,a.identify_name as name,a.lvl,
+					b.contacts,b.contact_mobile as contactMobile,b.international,0 as expert,0 as celebrity,
 					dg1.name as province,dg2.name as city, dg3.name as area,c.name as industry
 				from 
 				(select 
-					id,type,status,create_time,service_certification,user_certification,current_member_status
+					id,type,status,create_time,service_certification,user_certification,current_member_status,identify_name,lvl
 				from user
 					where type = 1
 					<if test="aid != null and aid !=''">
 						and aid = #{aid,jdbcType=VARCHAR}
 					</if>		
-					<if test="shareType != null and shareType !=''">
+					<if test="shareType != null">
 						and share_type = #{shareType,jdbcType=VARCHAR}
 					</if>			
 					<if test="status != null">
@@ -251,7 +251,7 @@
 						<if test="aid != null and aid !=''">
 							and aid = #{aid,jdbcType=VARCHAR}
 						</if>	
-						<if test="shareType != null and shareType !=''">
+						<if test="shareType != null">
 							and share_type = #{shareType,jdbcType=VARCHAR}
 						</if>				
 						<if test="status != null">
@@ -301,7 +301,7 @@
 						<if test="aid != null and aid !=''">
 							and aid = #{aid,jdbcType=VARCHAR}
 						</if>		
-						<if test="shareType != null and shareType !=''">
+						<if test="shareType != null">
 							and share_type = #{shareType,jdbcType=VARCHAR}
 						</if>		
 						<if test="status != null">
@@ -353,7 +353,7 @@
 							<if test="aid != null and aid !=''">
 								and aid = #{aid,jdbcType=VARCHAR}
 							</if>	
-							<if test="shareType != null and shareType !=''">
+							<if test="shareType != null">
 								and share_type = #{shareType,jdbcType=VARCHAR}
 							</if>				
 							<if test="status != null">
@@ -402,7 +402,7 @@
 							<if test="aid != null and aid !=''">
 								and aid = #{aid,jdbcType=VARCHAR}
 							</if>	
-							<if test="shareType != null and shareType !=''">
+							<if test="shareType != null">
 								and share_type = #{shareType,jdbcType=VARCHAR}
 							</if>				
 							<if test="status != null">

Разница между файлами не показана из-за своего большого размера
+ 186 - 209
src/main/java/com/goafanti/common/model/OrganizationIdentity.java


+ 16 - 86
src/main/java/com/goafanti/common/model/OrganizationIdentityExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class OrganizationIdentityExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public OrganizationIdentityExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -724,76 +724,6 @@ public class OrganizationIdentityExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andAftUsernameIsNull() {
-			addCriterion("aft_username is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameIsNotNull() {
-			addCriterion("aft_username is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameEqualTo(String value) {
-			addCriterion("aft_username =", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotEqualTo(String value) {
-			addCriterion("aft_username <>", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameGreaterThan(String value) {
-			addCriterion("aft_username >", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameGreaterThanOrEqualTo(String value) {
-			addCriterion("aft_username >=", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameLessThan(String value) {
-			addCriterion("aft_username <", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameLessThanOrEqualTo(String value) {
-			addCriterion("aft_username <=", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameLike(String value) {
-			addCriterion("aft_username like", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotLike(String value) {
-			addCriterion("aft_username not like", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameIn(List<String> values) {
-			addCriterion("aft_username in", values, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotIn(List<String> values) {
-			addCriterion("aft_username not in", values, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameBetween(String value1, String value2) {
-			addCriterion("aft_username between", value1, value2, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotBetween(String value1, String value2) {
-			addCriterion("aft_username not between", value1, value2, "aftUsername");
-			return (Criteria) this;
-		}
-
 		public Criteria andUnitNameIsNull() {
 			addCriterion("unit_name is null");
 			return (Criteria) this;
@@ -4317,7 +4247,7 @@ public class OrganizationIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_identity
-	 * @mbg.generated  Sat Nov 11 11:06:53 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -5,139 +5,139 @@ import java.util.Date;
 public class User implements AftUser{
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.id
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mobile
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.password
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String password;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.nickname
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String nickname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.email
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.create_time
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.number
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Long number;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.lvl
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.type
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.aid
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.mid
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String mid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.status
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.source
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer source;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.update_time
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.company_logo_url
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String companyLogoUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.head_portrait_url
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String headPortraitUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.society_tag
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String societyTag;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.company_name
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
-	 */
-	private String companyName;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.introduction
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String introduction;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.service_certification
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer serviceCertification;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.user_certification
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer userCertification;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.last_member_order_id
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String lastMemberOrderId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.current_member_status
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer currentMemberStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.value_added_tag
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String valueAddedTag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.organization_id
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private String organizationId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.share_type
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	private Integer shareType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.identify_name
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
+	 */
+	private String identifyName;
 
 	/**
 	 * 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -146,7 +146,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -155,7 +155,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getMobile() {
 		return mobile;
@@ -164,7 +164,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -173,7 +173,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getPassword() {
 		return password;
@@ -182,7 +182,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setPassword(String password) {
 		this.password = password;
@@ -191,7 +191,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getNickname() {
 		return nickname;
@@ -200,7 +200,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
@@ -209,7 +209,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -218,7 +218,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -227,7 +227,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -236,7 +236,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -245,7 +245,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Long getNumber() {
 		return number;
@@ -254,7 +254,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setNumber(Long number) {
 		this.number = number;
@@ -263,7 +263,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getLvl() {
 		return lvl;
@@ -272,7 +272,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
@@ -281,7 +281,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getType() {
 		return type;
@@ -290,7 +290,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -299,7 +299,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getAid() {
 		return aid;
@@ -308,7 +308,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -317,7 +317,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getMid() {
 		return mid;
@@ -326,7 +326,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setMid(String mid) {
 		this.mid = mid;
@@ -335,7 +335,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getStatus() {
 		return status;
@@ -344,7 +344,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -353,7 +353,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getSource() {
 		return source;
@@ -362,7 +362,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setSource(Integer source) {
 		this.source = source;
@@ -371,7 +371,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -380,7 +380,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -389,7 +389,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getCompanyLogoUrl() {
 		return companyLogoUrl;
@@ -398,7 +398,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setCompanyLogoUrl(String companyLogoUrl) {
 		this.companyLogoUrl = companyLogoUrl;
@@ -407,7 +407,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getHeadPortraitUrl() {
 		return headPortraitUrl;
@@ -416,7 +416,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
@@ -425,7 +425,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getSocietyTag() {
 		return societyTag;
@@ -434,34 +434,16 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.company_name
-	 * @return  the value of user.company_name
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
-	 */
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.company_name
-	 * @param companyName  the value for user.company_name
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
-	 */
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
-	/**
 	 * 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getIntroduction() {
 		return introduction;
@@ -470,7 +452,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
@@ -479,7 +461,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.service_certification
 	 * @return  the value of user.service_certification
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getServiceCertification() {
 		return serviceCertification;
@@ -488,7 +470,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.service_certification
 	 * @param serviceCertification  the value for user.service_certification
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setServiceCertification(Integer serviceCertification) {
 		this.serviceCertification = serviceCertification;
@@ -497,7 +479,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.user_certification
 	 * @return  the value of user.user_certification
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getUserCertification() {
 		return userCertification;
@@ -506,7 +488,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.user_certification
 	 * @param userCertification  the value for user.user_certification
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setUserCertification(Integer userCertification) {
 		this.userCertification = userCertification;
@@ -515,7 +497,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.last_member_order_id
 	 * @return  the value of user.last_member_order_id
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getLastMemberOrderId() {
 		return lastMemberOrderId;
@@ -524,7 +506,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.last_member_order_id
 	 * @param lastMemberOrderId  the value for user.last_member_order_id
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setLastMemberOrderId(String lastMemberOrderId) {
 		this.lastMemberOrderId = lastMemberOrderId;
@@ -533,7 +515,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user.current_member_status
 	 * @return  the value of user.current_member_status
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getCurrentMemberStatus() {
 		return currentMemberStatus;
@@ -542,7 +524,7 @@ public class User implements AftUser{
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user.current_member_status
 	 * @param currentMemberStatus  the value for user.current_member_status
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setCurrentMemberStatus(Integer currentMemberStatus) {
 		this.currentMemberStatus = currentMemberStatus;
@@ -551,7 +533,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getValueAddedTag() {
 		return valueAddedTag;
@@ -560,7 +542,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setValueAddedTag(String valueAddedTag) {
 		this.valueAddedTag = valueAddedTag;
@@ -569,7 +551,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public String getOrganizationId() {
 		return organizationId;
@@ -578,7 +560,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setOrganizationId(String organizationId) {
 		this.organizationId = organizationId;
@@ -587,7 +569,7 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public Integer getShareType() {
 		return shareType;
@@ -596,13 +578,31 @@ public class User 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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public void setShareType(Integer shareType) {
 		this.shareType = shareType;
 	}
 
 	/**
+	 * 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  Sun Nov 12 10:11:30 CST 2017
+	 */
+	public String getIdentifyName() {
+		return identifyName;
+	}
+
+	/**
+	 * 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  Sun Nov 12 10:11:30 CST 2017
+	 */
+	public void setIdentifyName(String identifyName) {
+		this.identifyName = identifyName;
+	}
+
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 3623836456120030806L;

+ 86 - 86
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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	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 Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1283,76 +1283,6 @@ public class UserExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andCompanyNameIsNull() {
-			addCriterion("company_name is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameIsNotNull() {
-			addCriterion("company_name is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameEqualTo(String value) {
-			addCriterion("company_name =", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotEqualTo(String value) {
-			addCriterion("company_name <>", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameGreaterThan(String value) {
-			addCriterion("company_name >", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
-			addCriterion("company_name >=", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameLessThan(String value) {
-			addCriterion("company_name <", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameLessThanOrEqualTo(String value) {
-			addCriterion("company_name <=", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameLike(String value) {
-			addCriterion("company_name like", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotLike(String value) {
-			addCriterion("company_name not like", value, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameIn(List<String> values) {
-			addCriterion("company_name in", values, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotIn(List<String> values) {
-			addCriterion("company_name not in", values, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameBetween(String value1, String value2) {
-			addCriterion("company_name between", value1, value2, "companyName");
-			return (Criteria) this;
-		}
-
-		public Criteria andCompanyNameNotBetween(String value1, String value2) {
-			addCriterion("company_name not between", value1, value2, "companyName");
-			return (Criteria) this;
-		}
-
 		public Criteria andIntroductionIsNull() {
 			addCriterion("introduction is null");
 			return (Criteria) this;
@@ -1872,11 +1802,81 @@ public class UserExample {
 			addCriterion("share_type not between", value1, value2, "shareType");
 			return (Criteria) this;
 		}
+
+		public Criteria andIdentifyNameIsNull() {
+			addCriterion("identify_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameIsNotNull() {
+			addCriterion("identify_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameEqualTo(String value) {
+			addCriterion("identify_name =", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameNotEqualTo(String value) {
+			addCriterion("identify_name <>", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameGreaterThan(String value) {
+			addCriterion("identify_name >", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameGreaterThanOrEqualTo(String value) {
+			addCriterion("identify_name >=", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameLessThan(String value) {
+			addCriterion("identify_name <", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameLessThanOrEqualTo(String value) {
+			addCriterion("identify_name <=", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameLike(String value) {
+			addCriterion("identify_name like", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameNotLike(String value) {
+			addCriterion("identify_name not like", value, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameIn(List<String> values) {
+			addCriterion("identify_name in", values, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameNotIn(List<String> values) {
+			addCriterion("identify_name not in", values, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameBetween(String value1, String value2) {
+			addCriterion("identify_name between", value1, value2, "identifyName");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdentifyNameNotBetween(String value1, String value2) {
+			addCriterion("identify_name not between", value1, value2, "identifyName");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user
-	 * @mbg.generated  Sat Nov 11 13:33:03 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:11:30 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 93 - 116
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -7,169 +7,164 @@ public class UserIdentity {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.uid
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.username
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String username;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.sex
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.date_of_birth_year
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String dateOfBirthYear;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.date_of_birth_month
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String dateOfBirthMonth;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id_number
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String idNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.positive_id_url
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String positiveIdUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.opposite_id_url
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String oppositeIdUrl;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.aft_username
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
-	 */
-	private String aftUsername;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.province
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.city
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.area
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer area;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contact_mobile
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String contactMobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_name
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String bankName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_account
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String bankAccount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_card_number
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String bankCardNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.amount_money
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private BigDecimal amountMoney;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.audit_status
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer auditStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.process
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer process;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.wrong_count
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer wrongCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.payment_date
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Date paymentDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.expert
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer expert;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.celebrity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer celebrity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.international
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer international;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.fixed_tel
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.qq
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String qq;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postal_address
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String postalAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postcode
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String postcode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.review_instructions
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String reviewInstructions;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.industry
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private Integer industry;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contacts
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	private String contacts;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.id
 	 * @return  the value of user_identity.id
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -178,7 +173,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.id
 	 * @param id  the value for user_identity.id
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -187,7 +182,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.uid
 	 * @return  the value of user_identity.uid
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getUid() {
 		return uid;
@@ -196,7 +191,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.uid
 	 * @param uid  the value for user_identity.uid
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -205,7 +200,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.username
 	 * @return  the value of user_identity.username
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getUsername() {
 		return username;
@@ -214,7 +209,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.username
 	 * @param username  the value for user_identity.username
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setUsername(String username) {
 		this.username = username;
@@ -223,7 +218,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.sex
 	 * @return  the value of user_identity.sex
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -232,7 +227,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.sex
 	 * @param sex  the value for user_identity.sex
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -241,7 +236,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.date_of_birth_year
 	 * @return  the value of user_identity.date_of_birth_year
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getDateOfBirthYear() {
 		return dateOfBirthYear;
@@ -250,7 +245,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.date_of_birth_year
 	 * @param dateOfBirthYear  the value for user_identity.date_of_birth_year
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setDateOfBirthYear(String dateOfBirthYear) {
 		this.dateOfBirthYear = dateOfBirthYear;
@@ -259,7 +254,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.date_of_birth_month
 	 * @return  the value of user_identity.date_of_birth_month
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getDateOfBirthMonth() {
 		return dateOfBirthMonth;
@@ -268,7 +263,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.date_of_birth_month
 	 * @param dateOfBirthMonth  the value for user_identity.date_of_birth_month
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setDateOfBirthMonth(String dateOfBirthMonth) {
 		this.dateOfBirthMonth = dateOfBirthMonth;
@@ -277,7 +272,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.id_number
 	 * @return  the value of user_identity.id_number
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getIdNumber() {
 		return idNumber;
@@ -286,7 +281,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.id_number
 	 * @param idNumber  the value for user_identity.id_number
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setIdNumber(String idNumber) {
 		this.idNumber = idNumber;
@@ -295,7 +290,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.positive_id_url
 	 * @return  the value of user_identity.positive_id_url
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getPositiveIdUrl() {
 		return positiveIdUrl;
@@ -304,7 +299,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.positive_id_url
 	 * @param positiveIdUrl  the value for user_identity.positive_id_url
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setPositiveIdUrl(String positiveIdUrl) {
 		this.positiveIdUrl = positiveIdUrl;
@@ -313,7 +308,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.opposite_id_url
 	 * @return  the value of user_identity.opposite_id_url
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getOppositeIdUrl() {
 		return oppositeIdUrl;
@@ -322,34 +317,16 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.opposite_id_url
 	 * @param oppositeIdUrl  the value for user_identity.opposite_id_url
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setOppositeIdUrl(String oppositeIdUrl) {
 		this.oppositeIdUrl = oppositeIdUrl;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.aft_username
-	 * @return  the value of user_identity.aft_username
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
-	 */
-	public String getAftUsername() {
-		return aftUsername;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.aft_username
-	 * @param aftUsername  the value for user_identity.aft_username
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
-	 */
-	public void setAftUsername(String aftUsername) {
-		this.aftUsername = aftUsername;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.province
 	 * @return  the value of user_identity.province
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getProvince() {
 		return province;
@@ -358,7 +335,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.province
 	 * @param province  the value for user_identity.province
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -367,7 +344,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.city
 	 * @return  the value of user_identity.city
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getCity() {
 		return city;
@@ -376,7 +353,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.city
 	 * @param city  the value for user_identity.city
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setCity(Integer city) {
 		this.city = city;
@@ -385,7 +362,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.area
 	 * @return  the value of user_identity.area
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getArea() {
 		return area;
@@ -394,7 +371,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.area
 	 * @param area  the value for user_identity.area
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setArea(Integer area) {
 		this.area = area;
@@ -403,7 +380,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.contact_mobile
 	 * @return  the value of user_identity.contact_mobile
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -412,7 +389,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.contact_mobile
 	 * @param contactMobile  the value for user_identity.contact_mobile
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -421,7 +398,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_name
 	 * @return  the value of user_identity.bank_name
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getBankName() {
 		return bankName;
@@ -430,7 +407,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_name
 	 * @param bankName  the value for user_identity.bank_name
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
@@ -439,7 +416,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_account
 	 * @return  the value of user_identity.bank_account
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getBankAccount() {
 		return bankAccount;
@@ -448,7 +425,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_account
 	 * @param bankAccount  the value for user_identity.bank_account
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setBankAccount(String bankAccount) {
 		this.bankAccount = bankAccount;
@@ -457,7 +434,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_card_number
 	 * @return  the value of user_identity.bank_card_number
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getBankCardNumber() {
 		return bankCardNumber;
@@ -466,7 +443,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_card_number
 	 * @param bankCardNumber  the value for user_identity.bank_card_number
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setBankCardNumber(String bankCardNumber) {
 		this.bankCardNumber = bankCardNumber;
@@ -475,7 +452,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.amount_money
 	 * @return  the value of user_identity.amount_money
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public BigDecimal getAmountMoney() {
 		return amountMoney;
@@ -484,7 +461,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.amount_money
 	 * @param amountMoney  the value for user_identity.amount_money
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setAmountMoney(BigDecimal amountMoney) {
 		this.amountMoney = amountMoney;
@@ -493,7 +470,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.audit_status
 	 * @return  the value of user_identity.audit_status
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -502,7 +479,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.audit_status
 	 * @param auditStatus  the value for user_identity.audit_status
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
@@ -511,7 +488,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.process
 	 * @return  the value of user_identity.process
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getProcess() {
 		return process;
@@ -520,7 +497,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.process
 	 * @param process  the value for user_identity.process
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setProcess(Integer process) {
 		this.process = process;
@@ -529,7 +506,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.wrong_count
 	 * @return  the value of user_identity.wrong_count
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getWrongCount() {
 		return wrongCount;
@@ -538,7 +515,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.wrong_count
 	 * @param wrongCount  the value for user_identity.wrong_count
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setWrongCount(Integer wrongCount) {
 		this.wrongCount = wrongCount;
@@ -547,7 +524,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.payment_date
 	 * @return  the value of user_identity.payment_date
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Date getPaymentDate() {
 		return paymentDate;
@@ -556,7 +533,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.payment_date
 	 * @param paymentDate  the value for user_identity.payment_date
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setPaymentDate(Date paymentDate) {
 		this.paymentDate = paymentDate;
@@ -565,7 +542,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.expert
 	 * @return  the value of user_identity.expert
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getExpert() {
 		return expert;
@@ -574,7 +551,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.expert
 	 * @param expert  the value for user_identity.expert
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setExpert(Integer expert) {
 		this.expert = expert;
@@ -583,7 +560,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.celebrity
 	 * @return  the value of user_identity.celebrity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getCelebrity() {
 		return celebrity;
@@ -592,7 +569,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.celebrity
 	 * @param celebrity  the value for user_identity.celebrity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setCelebrity(Integer celebrity) {
 		this.celebrity = celebrity;
@@ -601,7 +578,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.international
 	 * @return  the value of user_identity.international
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getInternational() {
 		return international;
@@ -610,7 +587,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.international
 	 * @param international  the value for user_identity.international
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setInternational(Integer international) {
 		this.international = international;
@@ -619,7 +596,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.fixed_tel
 	 * @return  the value of user_identity.fixed_tel
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -628,7 +605,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.fixed_tel
 	 * @param fixedTel  the value for user_identity.fixed_tel
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -637,7 +614,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.qq
 	 * @return  the value of user_identity.qq
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -646,7 +623,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.qq
 	 * @param qq  the value for user_identity.qq
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -655,7 +632,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.postal_address
 	 * @return  the value of user_identity.postal_address
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getPostalAddress() {
 		return postalAddress;
@@ -664,7 +641,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.postal_address
 	 * @param postalAddress  the value for user_identity.postal_address
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setPostalAddress(String postalAddress) {
 		this.postalAddress = postalAddress;
@@ -673,7 +650,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.postcode
 	 * @return  the value of user_identity.postcode
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getPostcode() {
 		return postcode;
@@ -682,7 +659,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.postcode
 	 * @param postcode  the value for user_identity.postcode
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setPostcode(String postcode) {
 		this.postcode = postcode;
@@ -691,7 +668,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.review_instructions
 	 * @return  the value of user_identity.review_instructions
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getReviewInstructions() {
 		return reviewInstructions;
@@ -700,7 +677,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.review_instructions
 	 * @param reviewInstructions  the value for user_identity.review_instructions
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setReviewInstructions(String reviewInstructions) {
 		this.reviewInstructions = reviewInstructions;
@@ -709,7 +686,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.industry
 	 * @return  the value of user_identity.industry
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Integer getIndustry() {
 		return industry;
@@ -718,7 +695,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.industry
 	 * @param industry  the value for user_identity.industry
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
@@ -727,7 +704,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.contacts
 	 * @return  the value of user_identity.contacts
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getContacts() {
 		return contacts;
@@ -736,7 +713,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.contacts
 	 * @param contacts  the value for user_identity.contacts
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;

+ 16 - 86
src/main/java/com/goafanti/common/model/UserIdentityExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class UserIdentityExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public UserIdentityExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -794,76 +794,6 @@ public class UserIdentityExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andAftUsernameIsNull() {
-			addCriterion("aft_username is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameIsNotNull() {
-			addCriterion("aft_username is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameEqualTo(String value) {
-			addCriterion("aft_username =", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotEqualTo(String value) {
-			addCriterion("aft_username <>", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameGreaterThan(String value) {
-			addCriterion("aft_username >", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameGreaterThanOrEqualTo(String value) {
-			addCriterion("aft_username >=", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameLessThan(String value) {
-			addCriterion("aft_username <", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameLessThanOrEqualTo(String value) {
-			addCriterion("aft_username <=", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameLike(String value) {
-			addCriterion("aft_username like", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotLike(String value) {
-			addCriterion("aft_username not like", value, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameIn(List<String> values) {
-			addCriterion("aft_username in", values, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotIn(List<String> values) {
-			addCriterion("aft_username not in", values, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameBetween(String value1, String value2) {
-			addCriterion("aft_username between", value1, value2, "aftUsername");
-			return (Criteria) this;
-		}
-
-		public Criteria andAftUsernameNotBetween(String value1, String value2) {
-			addCriterion("aft_username not between", value1, value2, "aftUsername");
-			return (Criteria) this;
-		}
-
 		public Criteria andProvinceIsNull() {
 			addCriterion("province is null");
 			return (Criteria) this;
@@ -2287,7 +2217,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Sat Nov 11 11:58:34 CST 2017
+	 * @mbg.generated  Sun Nov 12 10:00:10 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 0 - 11
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -34,9 +34,6 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		postcode;
 
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		aftUsername;
-
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		unitName;
 
@@ -222,14 +219,6 @@ public class InputOrganizationIdentity {
 		this.postcode = postcode;
 	}
 
-	public String getAftUsername() {
-		return aftUsername;
-	}
-
-	public void setAftUsername(String aftUsername) {
-		this.aftUsername = aftUsername;
-	}
-
 	public String getUnitName() {
 		return unitName;
 	}

+ 0 - 11
src/main/java/com/goafanti/user/bo/InputUserIdentity.java

@@ -38,9 +38,6 @@ public class InputUserIdentity {
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		oppositeIdUrl;
 
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		aftUsername;
-
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		province;
@@ -199,14 +196,6 @@ public class InputUserIdentity {
 		this.oppositeIdUrl = oppositeIdUrl;
 	}
 
-	public String getAftUsername() {
-		return aftUsername;
-	}
-
-	public void setAftUsername(String aftUsername) {
-		this.aftUsername = aftUsername;
-	}
-
 	public Integer getProvince() {
 		return province;
 	}

+ 0 - 13
src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

@@ -15,11 +15,6 @@ public class OrgIdentityDetailBo {
 	private String		uid;
 
 	/**
-	 * 用户名
-	 */
-	private String		aftUsername;
-
-	/**
 	 * 单位名称
 	 */
 	private String		unitName;
@@ -175,14 +170,6 @@ public class OrgIdentityDetailBo {
 		this.uid = uid;
 	}
 
-	public String getAftUsername() {
-		return aftUsername;
-	}
-
-	public void setAftUsername(String aftUsername) {
-		this.aftUsername = aftUsername;
-	}
-
 	public String getUnitName() {
 		return unitName;
 	}

+ 0 - 10
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -19,8 +19,6 @@ public class OrgListBo {
 
 	private Integer	number;
 
-	private String	aftUsername;
-
 	private Integer	orgAuditStatus;
 
 	private String	adminName;
@@ -91,14 +89,6 @@ public class OrgListBo {
 		this.number = number;
 	}
 
-	public String getAftUsername() {
-		return aftUsername;
-	}
-
-	public void setAftUsername(String aftUsername) {
-		this.aftUsername = aftUsername;
-	}
-
 	public String getAdminName() {
 		return adminName;
 	}

+ 0 - 10
src/main/java/com/goafanti/user/bo/UserListBo.java

@@ -20,8 +20,6 @@ public class UserListBo {
 
 	private Integer	number;
 
-	private String	aftUsername;
-
 	private Integer	auditStatus;
 
 	private String	adminName;
@@ -78,14 +76,6 @@ public class UserListBo {
 		this.number = number;
 	}
 
-	public String getAftUsername() {
-		return aftUsername;
-	}
-
-	public void setAftUsername(String aftUsername) {
-		this.aftUsername = aftUsername;
-	}
-
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;

+ 0 - 6
src/main/java/com/goafanti/user/service/UserService.java

@@ -34,12 +34,6 @@ public interface UserService {
 
 	UserDownLoadBo selectUserDownLoadBoByUserId(String userId);
 
-	Pagination<UserListBo> listUser(String username, String mobile, String email, String[] createTime, Integer number,
-			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
-
-	Pagination<OrgListBo> listOrg(String uid, String mobile, String email, String[] createTime, Integer number,
-			String unitName, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
-
 	Pagination<OrgListBo> selectUserByAid(Integer number, String mobile, Integer auditStatus, String auditName,
 			String email, String adminId, String startCreateTime, String endCreateTime, Integer type, Integer pNo,
 			Integer pSize);

+ 0 - 152
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -130,158 +130,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<UserListBo> listUser(String username, String mobile, String email, String[] pDate, Integer number,
-			String aftUsername, Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
-		Map<String, Object> params = new HashMap<>();
-		Date pStart = null;
-		Date pEnd = null;
-
-		if (null != pDate) {
-			pStart = DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
-			if (pDate.length == 2) {
-				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
-			}
-		}
-
-		if (null != pStart) {
-			params.put("pStart", pStart);
-		}
-
-		if (null != pEnd) {
-			params.put("pEnd", pEnd);
-		}
-
-		if (!StringUtils.isBlank(mobile)) {
-			params.put("mobile", mobile);
-		}
-
-		if (!StringUtils.isBlank(email)) {
-			params.put("email", email);
-		}
-
-		if (null != number) {
-			params.put("number", number);
-		}
-
-		if (!StringUtils.isBlank(username)) {
-			params.put("username", username);
-		}
-
-		if (null != auditStatus) {
-			params.put("auditStatus", auditStatus);
-		}
-
-		if (!StringUtils.isBlank(aftUsername)) {
-			params.put("aftUsername", aftUsername);
-		}
-
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 1;
-		}
-
-		if (pageSize == null || pageSize < 0 || pageSize > 10) {
-			pageSize = 10;
-		}
-
-		if (TokenManager.hasRole(AFTConstants.AREAADMIN) || TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
-			List<Integer> provinceList = adminLocationMapper
-					.selectProvinceWhereCityIsNullByAdminId(TokenManager.getAdminId());
-			List<Integer> cityList = adminLocationMapper.selectCityByAdminId(TokenManager.getAdminId());
-			provinceList.addAll(cityList);
-			if (null != provinceList && provinceList.size() > 0) {
-				params.put("provinceList", provinceList);
-			}
-			if (null != cityList && cityList.size() > 0) {
-				params.put("cityList", cityList);
-			}
-			return (Pagination<UserListBo>) findPage("findAreaManagerUserListByPage", "findAreaManagerUserCount",
-					params, pageNo, pageSize);
-		} else if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
-			return (Pagination<UserListBo>) findPage("findUserListByPage", "findUserCount", params, pageNo, pageSize);
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<OrgListBo> listOrg(String uid, String mobile, String email, String[] pDate, Integer number,
-			String unitName, Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
-		Map<String, Object> params = new HashMap<>();
-		Date pStart = null;
-		Date pEnd = null;
-
-		if (null != pDate && pDate.length > 0) {
-			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
-			pEnd = StringUtils.isBlank(pDate[1]) ? null
-					: DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
-
-			pStart = DateUtils.parseDate(pDate[0], AFTConstants.YYYYMMDD);
-			if (pDate.length == 2) {
-				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], AFTConstants.YYYYMMDD), 1);
-			}
-		}
-
-		if (null != pStart) {
-			params.put("pStart", pStart);
-		}
-
-		if (null != pEnd) {
-			params.put("pEnd", pEnd);
-		}
-
-		if (!StringUtils.isBlank(mobile)) {
-			params.put("mobile", mobile);
-		}
-
-		if (!StringUtils.isBlank(uid)) {
-			params.put("uid", uid);
-		}
-
-		if (!StringUtils.isBlank(email)) {
-			params.put("email", email);
-		}
-
-		if (null != number) {
-			params.put("number", number);
-		}
-
-		if (!StringUtils.isBlank(unitName)) {
-			params.put("unitName", unitName);
-		}
-
-		if (null != auditStatus) {
-			params.put("auditStatus", auditStatus);
-		}
-
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 1;
-		}
-
-		if (pageSize == null || pageSize < 0) {
-			pageSize = 10;
-		}
-
-		if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
-			return (Pagination<OrgListBo>) findPage("findOrgListByPage", "findOrgCount", params, pageNo, pageSize);
-		} else if (TokenManager.hasRole(AFTConstants.AREAADMIN) || TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
-			List<Integer> provinceList = adminLocationMapper
-					.selectProvinceWhereCityIsNullByAdminId(TokenManager.getAdminId());
-			List<Integer> cityList = adminLocationMapper.selectCityByAdminId(TokenManager.getAdminId());
-			provinceList.addAll(cityList);
-			if (null != provinceList && provinceList.size() > 0) {
-				params.put("provinceList", provinceList);
-			}
-			if (null != cityList && cityList.size() > 0) {
-				params.put("cityList", cityList);
-			}
-			return (Pagination<OrgListBo>) findPage("findAreaManagerOrgListByPage", "findAreaManagerOrgCount", params,
-					pageNo, pageSize);
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
 	public Pagination<OrgListBo> selectUserByAid(Integer number, String mobile, Integer auditStatus, String auditName,
 			String email, String aid, String startCreateTime, String endCreateTime, Integer type, Integer pageNo,
 			Integer pageSize) {