Kaynağa Gözat

修改领取,客户跟进模块修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 yıl önce
ebeveyn
işleme
94c8d378d4

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="personnel_dossier"/>
+    <table schema="aft" tableName="organization_contact_book"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

+ 12 - 12
src/main/java/com/goafanti/common/dao/OrganizationContactBookMapper.java

@@ -10,72 +10,72 @@ public interface OrganizationContactBookMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	long countByExample(OrganizationContactBookExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int deleteByExample(OrganizationContactBookExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int insert(OrganizationContactBook record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int insertSelective(OrganizationContactBook record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	List<OrganizationContactBook> selectByExample(OrganizationContactBookExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	OrganizationContactBook selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") OrganizationContactBook record,
 			@Param("example") OrganizationContactBookExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int updateByExample(@Param("record") OrganizationContactBook record,
 			@Param("example") OrganizationContactBookExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int updateByPrimaryKeySelective(OrganizationContactBook record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	int updateByPrimaryKey(OrganizationContactBook record);
-	
+
 	int checkContacts(@Param("uid")String uid,@Param("mobile")String mobile,@Param("aid")String aid);
 
 	int updateMainContact(@Param("ocbId")String ocbId);

+ 55 - 21
src/main/java/com/goafanti/common/mapper/OrganizationContactBookMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -20,12 +20,14 @@
     <result column="tel_num" jdbcType="VARCHAR" property="telNum" />
     <result column="major" jdbcType="INTEGER" property="major" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="fixed_tel" jdbcType="VARCHAR" property="fixedTel" />
+    <result column="aname" jdbcType="VARCHAR" property="aname" />
   </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 Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +95,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     id, uid, name, sex, mobile, email, qq, wechat, department, position, tel_num, major, 
-    aid
+    aid, fixed_tel, aname
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationContactBookExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     select
     <if test="distinct">
@@ -121,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     delete from organization_contact_book
     where id = #{id,jdbcType=VARCHAR}
@@ -141,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     delete from organization_contact_book
     <if test="_parameter != null">
@@ -152,22 +154,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     insert into organization_contact_book (id, uid, name, 
       sex, mobile, email, qq, 
       wechat, department, position, 
-      tel_num, major, aid)
+      tel_num, major, aid, 
+      fixed_tel, aname)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{sex,jdbcType=CHAR}, #{mobile,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{wechat,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
-      #{telNum,jdbcType=VARCHAR}, #{major,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR})
+      #{telNum,jdbcType=VARCHAR}, #{major,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
+      #{fixedTel,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationContactBook">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     insert into organization_contact_book
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -210,6 +214,12 @@
       <if test="aid != null">
         aid,
       </if>
+      <if test="fixedTel != null">
+        fixed_tel,
+      </if>
+      <if test="aname != null">
+        aname,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -251,13 +261,19 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="fixedTel != null">
+        #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        #{aname,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationContactBookExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     select count(*) from organization_contact_book
     <if test="_parameter != null">
@@ -268,7 +284,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     update organization_contact_book
     <set>
@@ -311,6 +327,12 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
+      <if test="record.fixedTel != null">
+        fixed_tel = #{record.fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aname != null">
+        aname = #{record.aname,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -320,7 +342,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     update organization_contact_book
     set id = #{record.id,jdbcType=VARCHAR},
@@ -335,7 +357,9 @@
       position = #{record.position,jdbcType=VARCHAR},
       tel_num = #{record.telNum,jdbcType=VARCHAR},
       major = #{record.major,jdbcType=INTEGER},
-      aid = #{record.aid,jdbcType=VARCHAR}
+      aid = #{record.aid,jdbcType=VARCHAR},
+      fixed_tel = #{record.fixedTel,jdbcType=VARCHAR},
+      aname = #{record.aname,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -344,7 +368,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     update organization_contact_book
     <set>
@@ -369,7 +393,9 @@
       <if test="wechat != null">
         wechat = #{wechat,jdbcType=VARCHAR},
       </if>
-      <if test="department != null">department</if>
+      <if test="department != null">
+        department = #{department,jdbcType=VARCHAR},
+      </if>
       <if test="position != null">
         position = #{position,jdbcType=VARCHAR},
       </if>
@@ -382,6 +408,12 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="fixedTel != null">
+        fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        aname = #{aname,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -389,7 +421,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Nov 19 20:34:03 CST 2017.
+      This element was generated on Fri Jun 05 08:58:43 CST 2020.
     -->
     update organization_contact_book
     set uid = #{uid,jdbcType=VARCHAR},
@@ -403,7 +435,9 @@
       position = #{position,jdbcType=VARCHAR},
       tel_num = #{telNum,jdbcType=VARCHAR},
       major = #{major,jdbcType=INTEGER},
-      aid = #{aid,jdbcType=VARCHAR}
+      aid = #{aid,jdbcType=VARCHAR},
+      fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      aname = #{aname,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -820,6 +820,7 @@
 		<if test="businessProjectId != null and businessProjectId != ''"><!--  客户甲项目A所有的跟进记录 -->
 			and e.business_project_id = #{businessProjectId,jdbcType=VARCHAR}
 		</if>
+   		 order by a.create_time desc
 		<if test="page_sql != null">
     		${page_sql}
    		 </if>
@@ -863,8 +864,11 @@
 	</select>
 	
 	<select id="findCustomerContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">
-		select id,name,mobile,email,qq,wechat,department,position,major from organization_contact_book
-		where uid = #{uid,jdbcType=VARCHAR} and aid = #{aid,jdbcType=VARCHAR}
+	select a.id,a.name,a.mobile,a.email,a.qq,a.wechat,a.department,a.position,a.major,a.fixed_tel fixedTel,a.aname,b.location_province,
+	d1.name provinceName,d2.name cityName,d3.name areaName,date_format(a.create_time,'%Y-%m-%d')createTimes from organization_contact_book a 
+	left join organization_identity b on a.uid=b.uid left join district_glossory d1 on b.location_province=d1.id 
+	left join district_glossory d2 on b.location_city=d2.id left join district_glossory d3 on b.location_area=d3.id 
+		where a.uid = #{uid,jdbcType=VARCHAR} order by a.create_time desc
 	</select>
 	
 	<select id="findAllContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">

+ 123 - 40
src/main/java/com/goafanti/common/model/OrganizationContactBook.java

@@ -4,74 +4,84 @@ public class OrganizationContactBook {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.id
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.uid
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.name
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.sex
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.mobile
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.email
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.qq
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String qq;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.wechat
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String wechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.department
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String department;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.position
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String position;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.tel_num
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String telNum;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.major
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private Integer major;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.aid
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.fixed_tel
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
+	 */
+	private String fixedTel;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.aname
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
+	 */
+	private String aname;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.id
 	 * @return  the value of organization_contact_book.id
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getId() {
 		return id;
@@ -80,7 +90,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.id
 	 * @param id  the value for organization_contact_book.id
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -89,7 +99,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.uid
 	 * @return  the value of organization_contact_book.uid
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getUid() {
 		return uid;
@@ -98,7 +108,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.uid
 	 * @param uid  the value for organization_contact_book.uid
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -107,7 +117,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.name
 	 * @return  the value of organization_contact_book.name
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getName() {
 		return name;
@@ -116,7 +126,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.name
 	 * @param name  the value for organization_contact_book.name
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -125,7 +135,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.sex
 	 * @return  the value of organization_contact_book.sex
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getSex() {
 		return sex;
@@ -134,7 +144,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.sex
 	 * @param sex  the value for organization_contact_book.sex
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -143,7 +153,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.mobile
 	 * @return  the value of organization_contact_book.mobile
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getMobile() {
 		return mobile;
@@ -152,7 +162,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.mobile
 	 * @param mobile  the value for organization_contact_book.mobile
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -161,7 +171,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.email
 	 * @return  the value of organization_contact_book.email
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getEmail() {
 		return email;
@@ -170,7 +180,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.email
 	 * @param email  the value for organization_contact_book.email
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -179,7 +189,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.qq
 	 * @return  the value of organization_contact_book.qq
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getQq() {
 		return qq;
@@ -188,7 +198,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.qq
 	 * @param qq  the value for organization_contact_book.qq
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -197,7 +207,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.wechat
 	 * @return  the value of organization_contact_book.wechat
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getWechat() {
 		return wechat;
@@ -206,7 +216,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.wechat
 	 * @param wechat  the value for organization_contact_book.wechat
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat;
@@ -215,7 +225,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.department
 	 * @return  the value of organization_contact_book.department
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getDepartment() {
 		return department;
@@ -224,7 +234,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.department
 	 * @param department  the value for organization_contact_book.department
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setDepartment(String department) {
 		this.department = department;
@@ -233,7 +243,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.position
 	 * @return  the value of organization_contact_book.position
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getPosition() {
 		return position;
@@ -242,7 +252,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.position
 	 * @param position  the value for organization_contact_book.position
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setPosition(String position) {
 		this.position = position;
@@ -251,7 +261,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.tel_num
 	 * @return  the value of organization_contact_book.tel_num
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getTelNum() {
 		return telNum;
@@ -260,7 +270,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.tel_num
 	 * @param telNum  the value for organization_contact_book.tel_num
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setTelNum(String telNum) {
 		this.telNum = telNum;
@@ -269,7 +279,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.major
 	 * @return  the value of organization_contact_book.major
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public Integer getMajor() {
 		return major;
@@ -278,7 +288,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.major
 	 * @param major  the value for organization_contact_book.major
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setMajor(Integer major) {
 		this.major = major;
@@ -287,7 +297,7 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.aid
 	 * @return  the value of organization_contact_book.aid
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -296,12 +306,53 @@ public class OrganizationContactBook {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.aid
 	 * @param aid  the value for organization_contact_book.aid
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.fixed_tel
+	 * @return  the value of organization_contact_book.fixed_tel
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
+	 */
+	public String getFixedTel() {
+		return fixedTel;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.fixed_tel
+	 * @param fixedTel  the value for organization_contact_book.fixed_tel
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
+	 */
+	public void setFixedTel(String fixedTel) {
+		this.fixedTel = fixedTel;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.aname
+	 * @return  the value of organization_contact_book.aname
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
+	 */
+	public String getAname() {
+		return aname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.aname
+	 * @param aname  the value for organization_contact_book.aname
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
+	 */
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+	
+	private String provinceName;
+	private String cityName;
+	private String areaName;
+	private String createTimes;
+
 	@Override  
     public boolean equals(Object arg0) {  
     	OrganizationContactBook p = (OrganizationContactBook) arg0;  
@@ -312,5 +363,37 @@ public class OrganizationContactBook {
     public int hashCode() {  
         String str = name + mobile;  
         return str.hashCode();  
-    }  
+    }
+
+	public String getProvinceName() {
+		return provinceName;
+	}
+
+	public void setProvinceName(String provinceName) {
+		this.provinceName = provinceName;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getAreaName() {
+		return areaName;
+	}
+
+	public void setAreaName(String areaName) {
+		this.areaName = areaName;
+	}
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}  
 }

+ 156 - 16
src/main/java/com/goafanti/common/model/OrganizationContactBookExample.java

@@ -6,23 +6,23 @@ import java.util.List;
 public class OrganizationContactBookExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public OrganizationContactBookExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -30,7 +30,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -38,7 +38,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -46,7 +46,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -54,7 +54,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -62,7 +62,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -70,7 +70,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -78,7 +78,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -88,7 +88,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -100,7 +100,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -109,7 +109,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -119,7 +119,7 @@ public class OrganizationContactBookExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1061,11 +1061,151 @@ public class OrganizationContactBookExample {
 			addCriterion("aid not between", value1, value2, "aid");
 			return (Criteria) this;
 		}
+
+		public Criteria andFixedTelIsNull() {
+			addCriterion("fixed_tel is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelIsNotNull() {
+			addCriterion("fixed_tel is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelEqualTo(String value) {
+			addCriterion("fixed_tel =", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelNotEqualTo(String value) {
+			addCriterion("fixed_tel <>", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelGreaterThan(String value) {
+			addCriterion("fixed_tel >", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelGreaterThanOrEqualTo(String value) {
+			addCriterion("fixed_tel >=", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelLessThan(String value) {
+			addCriterion("fixed_tel <", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelLessThanOrEqualTo(String value) {
+			addCriterion("fixed_tel <=", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelLike(String value) {
+			addCriterion("fixed_tel like", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelNotLike(String value) {
+			addCriterion("fixed_tel not like", value, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelIn(List<String> values) {
+			addCriterion("fixed_tel in", values, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelNotIn(List<String> values) {
+			addCriterion("fixed_tel not in", values, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelBetween(String value1, String value2) {
+			addCriterion("fixed_tel between", value1, value2, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andFixedTelNotBetween(String value1, String value2) {
+			addCriterion("fixed_tel not between", value1, value2, "fixedTel");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameIsNull() {
+			addCriterion("aname is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameIsNotNull() {
+			addCriterion("aname is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameEqualTo(String value) {
+			addCriterion("aname =", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotEqualTo(String value) {
+			addCriterion("aname <>", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameGreaterThan(String value) {
+			addCriterion("aname >", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameGreaterThanOrEqualTo(String value) {
+			addCriterion("aname >=", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameLessThan(String value) {
+			addCriterion("aname <", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameLessThanOrEqualTo(String value) {
+			addCriterion("aname <=", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameLike(String value) {
+			addCriterion("aname like", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotLike(String value) {
+			addCriterion("aname not like", value, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameIn(List<String> values) {
+			addCriterion("aname in", values, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotIn(List<String> values) {
+			addCriterion("aname not in", values, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameBetween(String value1, String value2) {
+			addCriterion("aname between", value1, value2, "aname");
+			return (Criteria) this;
+		}
+
+		public Criteria andAnameNotBetween(String value1, String value2) {
+			addCriterion("aname not between", value1, value2, "aname");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table organization_contact_book
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * @mbg.generated  Fri Jun 05 08:58:43 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 0 - 3
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -453,9 +453,6 @@ public class TOrderBillNew {
 	}
 
 	public String getPayeeName() {
-		if(payeeName==null) {
-			return "湖南科德信息咨询有限公司";
-		}
 		return payeeName;
 	}
 

+ 1 - 2
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -75,7 +75,6 @@ public class OrderDunTask {
 	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
 	@ResponseBody
 	@Scheduled(cron = "0 0 3  * * ?")
-//	@Scheduled(cron = "0 50 16  * * ?")
 	@Transactional(rollbackFor=Exception.class)
 	public void updateNewOrderDun(){
   		try {
@@ -165,7 +164,7 @@ public class OrderDunTask {
 	*
 	*/
 	@Scheduled(cron = "0 0 4 1 * ?") 
-//	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
+	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
   	@Transactional(rollbackFor=Exception.class)
 	public void pushOrderArrearsDun(){
 		try {

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

@@ -754,6 +754,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 						ocb.setId(UUID.randomUUID().toString());
 						ocb.setUid(uid);
 						ocb.setAid(TokenManager.getAdminId());
+						Admin ad=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+						ocb.setAname(ad.getName());
 						organizationContactBookMapper.insert(ocb);
 					}else{
 						organizationContactBookMapper.updateByPrimaryKeySelective(ocb);
@@ -938,8 +940,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
 			user.setInformationMaintainer(TokenManager.getAdminId());
 			user.setSource(2);//客户来源设置为领取
-//			转换不重置时间
-//			user.setTransferTime(now);
+			user.setTransferTime(now);
 			flag = addUserLock(uid,TokenManager.getAdminId(),0,null,now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
 			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>AFTConstants.USER_RCEIVE_MAX)
@@ -1171,6 +1172,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		ocb.setAid(TokenManager.getAdminId());
 		ocb.setId(UUID.randomUUID().toString());
 		ocb.setMajor(AFTConstants.NO);
+		Admin ad=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		ocb.setAname(ad.getName());
 		return organizationContactBookMapper.insert(ocb);
 	}