wanghui 7 lat temu
rodzic
commit
867c0025a7

+ 1 - 2
GeneratorConfig.xml

@@ -9,7 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao-server" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="user"/> 
-    <table schema="aft" tableName="user"/> 
+    <table schema="aft" tableName="organization_contact_book"/> 
   </context>
 </generatorConfiguration>

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

@@ -11,72 +11,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	int updateByPrimaryKey(OrganizationContactBook record);
-	
+
 	int checkContacts(@Param("uid")String uid,@Param("mobile")String mobile,@Param("aid")String aid);
 
 	int updateMainContact(@Param("ocbId")String ocbId);

+ 2 - 2
src/main/java/com/goafanti/common/enums/UserAuthentication.java

@@ -7,8 +7,8 @@ import org.apache.commons.lang3.StringUtils;
 
 public enum UserAuthentication {
 	UN_AUTHENTICATION(0,"未认证"),
-	PERSON_AUTHENTICATION(1,"个人认证"),
-	ORG_AUTHENTICATION(2,"企业认证");
+	AUTHENTICATION(1,"已认证");
+
 	private UserAuthentication(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;

+ 3 - 4
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -857,7 +857,7 @@
 		from demand a left join user b on a.employer_id = b.id 
 		where a.deleted_sign = 0
 		<if test="employerId != null">
-			a.employer_id = #{employerId,jdbcType=VARCHAR}
+			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>
 		<if test="startDate != null">
 			and a.create_time <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
@@ -887,11 +887,10 @@
 	<select id="selectDemandListCount" resultType="java.lang.Integer">
 		select
 			count(0)
-		from
-			demand
+		from demand a left join user b on a.employer_id = b.id 
 		where a.deleted_sign = 0
 		<if test="employerId != null">
-			a.employer_id = #{employerId,jdbcType=VARCHAR}
+			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>
 		<if test="startDate != null">
 			and a.create_time <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}

+ 456 - 439
src/main/java/com/goafanti/common/mapper/OrganizationContactBookMapper.xml

@@ -1,440 +1,457 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.OrganizationContactBookMapper">
-  <resultMap id="BaseResultMap" type="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.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="sex" jdbcType="CHAR" property="sex" />
-    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
-    <result column="qq" jdbcType="VARCHAR" property="qq" />
-    <result column="wechat" jdbcType="VARCHAR" property="wechat" />
-    <result column="depatrment" jdbcType="VARCHAR" property="depatrment" />
-    <result column="position" jdbcType="VARCHAR" property="position" />
-    <result column="tel_num" jdbcType="VARCHAR" property="telNum" />
-    <result column="major" jdbcType="INTEGER" property="major" />
-    <result column="aid" jdbcType="VARCHAR" property="aid" />
-  </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.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_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.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      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.
-    -->
-    id, uid, name, sex, mobile, email, qq, wechat, depatrment, position, tel_num, major, 
-    aid
-  </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.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from organization_contact_book
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" 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.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from organization_contact_book
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    <!--
-      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.
-    -->
-    delete from organization_contact_book
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationContactBookExample">
-    <!--
-      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.
-    -->
-    delete from organization_contact_book
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" 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.
-    -->
-    insert into organization_contact_book (id, uid, name, 
-      sex, mobile, email, qq, 
-      wechat, depatrment, position, 
-      tel_num, major, aid)
-    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}, #{depatrment,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
-      #{telNum,jdbcType=VARCHAR}, #{major,jdbcType=INTEGER}, #{aid,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.
-    -->
-    insert into organization_contact_book
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="uid != null">
-        uid,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="sex != null">
-        sex,
-      </if>
-      <if test="mobile != null">
-        mobile,
-      </if>
-      <if test="email != null">
-        email,
-      </if>
-      <if test="qq != null">
-        qq,
-      </if>
-      <if test="wechat != null">
-        wechat,
-      </if>
-      <if test="depatrment != null">
-        depatrment,
-      </if>
-      <if test="position != null">
-        position,
-      </if>
-      <if test="telNum != null">
-        tel_num,
-      </if>
-      <if test="major != null">
-        major,
-      </if>
-      <if test="aid != null">
-        aid,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="sex != null">
-        #{sex,jdbcType=CHAR},
-      </if>
-      <if test="mobile != null">
-        #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="qq != null">
-        #{qq,jdbcType=VARCHAR},
-      </if>
-      <if test="wechat != null">
-        #{wechat,jdbcType=VARCHAR},
-      </if>
-      <if test="depatrment != null">
-        #{depatrment,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="telNum != null">
-        #{telNum,jdbcType=VARCHAR},
-      </if>
-      <if test="major != null">
-        #{major,jdbcType=INTEGER},
-      </if>
-      <if test="aid != null">
-        #{aid,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.
-    -->
-    select count(*) from organization_contact_book
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      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.
-    -->
-    update organization_contact_book
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.uid != null">
-        uid = #{record.uid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sex != null">
-        sex = #{record.sex,jdbcType=CHAR},
-      </if>
-      <if test="record.mobile != null">
-        mobile = #{record.mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="record.email != null">
-        email = #{record.email,jdbcType=VARCHAR},
-      </if>
-      <if test="record.qq != null">
-        qq = #{record.qq,jdbcType=VARCHAR},
-      </if>
-      <if test="record.wechat != null">
-        wechat = #{record.wechat,jdbcType=VARCHAR},
-      </if>
-      <if test="record.depatrment != null">
-        depatrment = #{record.depatrment,jdbcType=VARCHAR},
-      </if>
-      <if test="record.position != null">
-        position = #{record.position,jdbcType=VARCHAR},
-      </if>
-      <if test="record.telNum != null">
-        tel_num = #{record.telNum,jdbcType=VARCHAR},
-      </if>
-      <if test="record.major != null">
-        major = #{record.major,jdbcType=INTEGER},
-      </if>
-      <if test="record.aid != null">
-        aid = #{record.aid,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      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.
-    -->
-    update organization_contact_book
-    set id = #{record.id,jdbcType=VARCHAR},
-      uid = #{record.uid,jdbcType=VARCHAR},
-      name = #{record.name,jdbcType=VARCHAR},
-      sex = #{record.sex,jdbcType=CHAR},
-      mobile = #{record.mobile,jdbcType=VARCHAR},
-      email = #{record.email,jdbcType=VARCHAR},
-      qq = #{record.qq,jdbcType=VARCHAR},
-      wechat = #{record.wechat,jdbcType=VARCHAR},
-      depatrment = #{record.depatrment,jdbcType=VARCHAR},
-      position = #{record.position,jdbcType=VARCHAR},
-      tel_num = #{record.telNum,jdbcType=VARCHAR},
-      major = #{record.major,jdbcType=INTEGER},
-      aid = #{record.aid,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" 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.
-    -->
-    update organization_contact_book
-    <set>
-      <if test="uid != null">
-        uid = #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="sex != null">
-        sex = #{sex,jdbcType=CHAR},
-      </if>
-      <if test="mobile != null">
-        mobile = #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="qq != null">
-        qq = #{qq,jdbcType=VARCHAR},
-      </if>
-      <if test="wechat != null">
-        wechat = #{wechat,jdbcType=VARCHAR},
-      </if>
-      <if test="depatrment != null">
-        depatrment = #{depatrment,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        position = #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="telNum != null">
-        tel_num = #{telNum,jdbcType=VARCHAR},
-      </if>
-      <if test="major != null">
-        major = #{major,jdbcType=INTEGER},
-      </if>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" 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.
-    -->
-    update organization_contact_book
-    set uid = #{uid,jdbcType=VARCHAR},
-      name = #{name,jdbcType=VARCHAR},
-      sex = #{sex,jdbcType=CHAR},
-      mobile = #{mobile,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR},
-      qq = #{qq,jdbcType=VARCHAR},
-      wechat = #{wechat,jdbcType=VARCHAR},
-      depatrment = #{depatrment,jdbcType=VARCHAR},
-      position = #{position,jdbcType=VARCHAR},
-      tel_num = #{telNum,jdbcType=VARCHAR},
-      major = #{major,jdbcType=INTEGER},
-      aid = #{aid,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
-  <select id="checkContacts" resultType="java.lang.Integer">
-	select
-	count( 0 )
-	from
-	organization_contact_book
-	where 1=1
-	<if test="uid != null">
-		and uid = #{uid,jdbcType=VARCHAR}
-	</if>
-	<if test="aid != null">
-		and aid = #{aid,jdbcType=VARCHAR}
-	</if>
-	<if test="mobile != null">
-		and mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-  </select>
-  
-  <update id="updateSubContact">
-  	 update organization_contact_book set major = 0 where uid = #{uid,jdbcType=VARCHAR}
-  </update>
-  <update id="updateMainContact">
-  	 update organization_contact_book set major = 1 where id = #{ocbId,jdbcType=VARCHAR}
-  </update>
-  
-  <select id="selectContactByUid" resultType="com.goafanti.user.bo.UserContactBo">
-  	select id,name,mobile,email,qq,wechat,depatrment,position,major from organization_contact_book
-	where uid = #{uid,jdbcType=VARCHAR}
-  </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OrganizationContactBookMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationContactBook">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="sex" jdbcType="CHAR" property="sex" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="qq" jdbcType="VARCHAR" property="qq" />
+    <result column="wechat" jdbcType="VARCHAR" property="wechat" />
+    <result column="department" jdbcType="VARCHAR" property="department" />
+    <result column="position" jdbcType="VARCHAR" property="position" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="tel_num" jdbcType="VARCHAR" property="telNum" />
+    <result column="major" jdbcType="INTEGER" property="major" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+  </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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    id, uid, name, sex, mobile, email, qq, wechat, department, position, remarks, tel_num, 
+    major, aid
+  </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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from organization_contact_book
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from organization_contact_book
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    delete from organization_contact_book
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationContactBookExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    delete from organization_contact_book
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" 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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    insert into organization_contact_book (id, uid, name, 
+      sex, mobile, email, qq, 
+      wechat, department, position, 
+      remarks, tel_num, major, 
+      aid)
+    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}, 
+      #{remarks,jdbcType=VARCHAR}, #{telNum,jdbcType=VARCHAR}, #{major,jdbcType=INTEGER}, 
+      #{aid,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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    insert into organization_contact_book
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="sex != null">
+        sex,
+      </if>
+      <if test="mobile != null">
+        mobile,
+      </if>
+      <if test="email != null">
+        email,
+      </if>
+      <if test="qq != null">
+        qq,
+      </if>
+      <if test="wechat != null">
+        wechat,
+      </if>
+      <if test="department != null">
+        department,
+      </if>
+      <if test="position != null">
+        position,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="telNum != null">
+        tel_num,
+      </if>
+      <if test="major != null">
+        major,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null">
+        #{sex,jdbcType=CHAR},
+      </if>
+      <if test="mobile != null">
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="wechat != null">
+        #{wechat,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null">
+        #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="telNum != null">
+        #{telNum,jdbcType=VARCHAR},
+      </if>
+      <if test="major != null">
+        #{major,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    select count(*) from organization_contact_book
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    update organization_contact_book
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uid != null">
+        uid = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sex != null">
+        sex = #{record.sex,jdbcType=CHAR},
+      </if>
+      <if test="record.mobile != null">
+        mobile = #{record.mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.email != null">
+        email = #{record.email,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qq != null">
+        qq = #{record.qq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wechat != null">
+        wechat = #{record.wechat,jdbcType=VARCHAR},
+      </if>
+      <if test="record.department != null">
+        department = #{record.department,jdbcType=VARCHAR},
+      </if>
+      <if test="record.position != null">
+        position = #{record.position,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.telNum != null">
+        tel_num = #{record.telNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.major != null">
+        major = #{record.major,jdbcType=INTEGER},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 16:31:20 CST 2018.
+    -->
+    update organization_contact_book
+    set id = #{record.id,jdbcType=VARCHAR},
+      uid = #{record.uid,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      sex = #{record.sex,jdbcType=CHAR},
+      mobile = #{record.mobile,jdbcType=VARCHAR},
+      email = #{record.email,jdbcType=VARCHAR},
+      qq = #{record.qq,jdbcType=VARCHAR},
+      wechat = #{record.wechat,jdbcType=VARCHAR},
+      department = #{record.department,jdbcType=VARCHAR},
+      position = #{record.position,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      tel_num = #{record.telNum,jdbcType=VARCHAR},
+      major = #{record.major,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" 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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    update organization_contact_book
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null">
+        sex = #{sex,jdbcType=CHAR},
+      </if>
+      <if test="mobile != null">
+        mobile = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        qq = #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="wechat != null">
+        wechat = #{wechat,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null">
+        department = #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        position = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="telNum != null">
+        tel_num = #{telNum,jdbcType=VARCHAR},
+      </if>
+      <if test="major != null">
+        major = #{major,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" 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 Tue Jun 12 16:31:20 CST 2018.
+    -->
+    update organization_contact_book
+    set uid = #{uid,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=CHAR},
+      mobile = #{mobile,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      qq = #{qq,jdbcType=VARCHAR},
+      wechat = #{wechat,jdbcType=VARCHAR},
+      department = #{department,jdbcType=VARCHAR},
+      position = #{position,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      tel_num = #{telNum,jdbcType=VARCHAR},
+      major = #{major,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="checkContacts" resultType="java.lang.Integer">
+	select
+	count( 0 )
+	from
+	organization_contact_book
+	where 1=1
+	<if test="uid != null">
+		and uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="aid != null">
+		and aid = #{aid,jdbcType=VARCHAR}
+	</if>
+	<if test="mobile != null">
+		and mobile = #{mobile,jdbcType=VARCHAR}
+	</if>
+  </select>
+  
+  <update id="updateSubContact">
+  	 update organization_contact_book set major = 0 where uid = #{uid,jdbcType=VARCHAR}
+  </update>
+  <update id="updateMainContact">
+  	 update organization_contact_book set major = 1 where id = #{ocbId,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectContactByUid" resultType="com.goafanti.user.bo.UserContactBo">
+  	select id,name,mobile,email,qq,wechat,department,position,major,remarks from organization_contact_book
+	where uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -1220,6 +1220,7 @@
 			a.company_logo_url as companyLogoUrl,
 			a.society_tag as societyTag,
 			a.authentication,
+			a.type,
 			b.id,
 			b.industry,
 			b.enterprise_scale as enterpriseScale,
@@ -1229,6 +1230,7 @@
 			b.legal_person_id_card as legalPersonIdCard,
 			b.legal_person_email as legalPersonEmail,
 			b.listed,
+			b.registered_capital as registeredCapital,
 			b.high_tech_zone as highTechZone,
 			b.licence_province as licenceProvince,
 			b.licence_city as licenceCity,

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

@@ -831,6 +831,7 @@
 		a.introduction,
 		a.head_portrait_url as headPortraitUrl,
 		a.society_tag as societyTag,
+		a.type,
 		a.authentication,
 		b.id,
 		b.industry,

+ 2 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -699,6 +699,8 @@
   	select 
   		id,
   		number,
+  		type,
+  		authentication,
   		username,
   		identify_name,
   		nickname,

+ 72 - 49
src/main/java/com/goafanti/common/model/OrganizationContactBook.java

@@ -4,74 +4,79 @@ 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	private String wechat;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.depatrment
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.department
+	 * @mbg.generated  Tue Jun 12 16:31:20 CST 2018
 	 */
-	private String depatrment;
+	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	private String position;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.remarks
+	 * @mbg.generated  Tue Jun 12 16:31:20 CST 2018
+	 */
+	private String remarks;
+	/**
 	 * 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	private String aid;
 
 	/**
 	 * 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -80,7 +85,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -89,7 +94,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getUid() {
 		return uid;
@@ -98,7 +103,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -107,7 +112,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getName() {
 		return name;
@@ -116,7 +121,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -125,7 +130,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getSex() {
 		return sex;
@@ -134,7 +139,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -143,7 +148,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getMobile() {
 		return mobile;
@@ -152,7 +157,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -161,7 +166,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getEmail() {
 		return email;
@@ -170,7 +175,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -179,7 +184,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getQq() {
 		return qq;
@@ -188,7 +193,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -197,7 +202,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getWechat() {
 		return wechat;
@@ -206,34 +211,34 @@ 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.depatrment
-	 * @return  the value of organization_contact_book.depatrment
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * 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  Tue Jun 12 16:31:20 CST 2018
 	 */
-	public String getDepatrment() {
-		return depatrment;
+	public String getDepartment() {
+		return department;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.depatrment
-	 * @param depatrment  the value for organization_contact_book.depatrment
-	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
+	 * 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  Tue Jun 12 16:31:20 CST 2018
 	 */
-	public void setDepatrment(String depatrment) {
-		this.depatrment = depatrment;
+	public void setDepartment(String department) {
+		this.department = department;
 	}
 
 	/**
 	 * 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getPosition() {
 		return position;
@@ -242,16 +247,34 @@ 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setPosition(String position) {
 		this.position = position;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.remarks
+	 * @return  the value of organization_contact_book.remarks
+	 * @mbg.generated  Tue Jun 12 16:31:20 CST 2018
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.remarks
+	 * @param remarks  the value for organization_contact_book.remarks
+	 * @mbg.generated  Tue Jun 12 16:31:20 CST 2018
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
 	 * 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getTelNum() {
 		return telNum;
@@ -260,7 +283,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setTelNum(String telNum) {
 		this.telNum = telNum;
@@ -269,7 +292,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public Integer getMajor() {
 		return major;
@@ -278,7 +301,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setMajor(Integer major) {
 		this.major = major;
@@ -287,7 +310,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public String getAid() {
 		return aid;
@@ -296,7 +319,7 @@ 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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;

+ 114 - 44
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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -722,73 +722,73 @@ public class OrganizationContactBookExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentIsNull() {
-			addCriterion("depatrment is null");
+		public Criteria andDepartmentIsNull() {
+			addCriterion("department is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentIsNotNull() {
-			addCriterion("depatrment is not null");
+		public Criteria andDepartmentIsNotNull() {
+			addCriterion("department is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentEqualTo(String value) {
-			addCriterion("depatrment =", value, "depatrment");
+		public Criteria andDepartmentEqualTo(String value) {
+			addCriterion("department =", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotEqualTo(String value) {
-			addCriterion("depatrment <>", value, "depatrment");
+		public Criteria andDepartmentNotEqualTo(String value) {
+			addCriterion("department <>", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentGreaterThan(String value) {
-			addCriterion("depatrment >", value, "depatrment");
+		public Criteria andDepartmentGreaterThan(String value) {
+			addCriterion("department >", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentGreaterThanOrEqualTo(String value) {
-			addCriterion("depatrment >=", value, "depatrment");
+		public Criteria andDepartmentGreaterThanOrEqualTo(String value) {
+			addCriterion("department >=", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentLessThan(String value) {
-			addCriterion("depatrment <", value, "depatrment");
+		public Criteria andDepartmentLessThan(String value) {
+			addCriterion("department <", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentLessThanOrEqualTo(String value) {
-			addCriterion("depatrment <=", value, "depatrment");
+		public Criteria andDepartmentLessThanOrEqualTo(String value) {
+			addCriterion("department <=", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentLike(String value) {
-			addCriterion("depatrment like", value, "depatrment");
+		public Criteria andDepartmentLike(String value) {
+			addCriterion("department like", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotLike(String value) {
-			addCriterion("depatrment not like", value, "depatrment");
+		public Criteria andDepartmentNotLike(String value) {
+			addCriterion("department not like", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentIn(List<String> values) {
-			addCriterion("depatrment in", values, "depatrment");
+		public Criteria andDepartmentIn(List<String> values) {
+			addCriterion("department in", values, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotIn(List<String> values) {
-			addCriterion("depatrment not in", values, "depatrment");
+		public Criteria andDepartmentNotIn(List<String> values) {
+			addCriterion("department not in", values, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentBetween(String value1, String value2) {
-			addCriterion("depatrment between", value1, value2, "depatrment");
+		public Criteria andDepartmentBetween(String value1, String value2) {
+			addCriterion("department between", value1, value2, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotBetween(String value1, String value2) {
-			addCriterion("depatrment not between", value1, value2, "depatrment");
+		public Criteria andDepartmentNotBetween(String value1, String value2) {
+			addCriterion("department not between", value1, value2, "department");
 			return (Criteria) this;
 		}
 
@@ -862,6 +862,76 @@ public class OrganizationContactBookExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
 		public Criteria andTelNumIsNull() {
 			addCriterion("tel_num is null");
 			return (Criteria) this;
@@ -1065,7 +1135,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  Tue Jun 12 16:31:20 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 10
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -1,18 +1,9 @@
 package com.goafanti.demand.bo;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 
-import org.apache.commons.lang3.time.DateFormatUtils;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.enums.DemandTypeEnum;
-import com.goafanti.common.utils.StringUtils;
 
 public class DemandListBo extends InputDemand{
 	//industryCategoryA String 映射
@@ -21,7 +12,7 @@ public class DemandListBo extends InputDemand{
 	private String		industryCategory2;
 	//industryCategoryC String 映射
 	private String		industryCategory3;
-//是否精品 0-false 1-true
+	//是否精品 0-false 1-true
 	private Integer 	boutique;
 	
 	//demandType String 映射

+ 4 - 4
src/main/java/com/goafanti/demand/controller/UserDemandApiController.java

@@ -87,7 +87,7 @@ public class UserDemandApiController extends CertifyApiController {
 	@RequestMapping(value = "/apply", method = RequestMethod.POST)
 	public Result userApply(@Valid InputDemand demand, BindingResult bindingResult,
 			@RequestParam(name = "keywords[]", required = false) String[] keywords,
-			@RequestParam(value = "publishPages[]", required = false)String[] publishPages,
+			@RequestParam(name = "publishPages[]", required = false) String[] publishPages,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -109,7 +109,7 @@ public class UserDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "页面参数错误"));
 			return res;
 		}
-		demandService.saveDemand(d, validityPeriodFormattedDate, keywords,webPages, appPages);
+		demandService.saveDemand(d, validityPeriodFormattedDate, keywords, webPages, appPages);
 		return res;
 	}
 
@@ -162,7 +162,7 @@ public class UserDemandApiController extends CertifyApiController {
 	@RequestMapping(value = "/updateDemand", method = RequestMethod.POST)
 	public Result updateDemand(@Valid InputDemand demand, BindingResult bindingResult,
 			@RequestParam(name = "keywords[]", required = false) String[] keywords,
-			@RequestParam(value = "publishPages[]", required = false)  String[] publishPages,
+			@RequestParam(name = "publishPages[]", required = false)  String[] publishPages,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -181,7 +181,7 @@ public class UserDemandApiController extends CertifyApiController {
 			return res;
 		}
 		//demand.setAuditStatus(DemandAuditStatus.INAUDIT.getCode()); 两步操作,先保存后提交
-		res = disposeDemand(res, demand, keywords,publishPages);
+		res = disposeDemand(res, demand, keywords, publishPages);
 		if (!res.getError().isEmpty()) {
 			return res;
 		}

+ 1 - 0
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -853,6 +853,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if(StringUtils.isNotBlank(name)) params.put("name", name);
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
+		params.put("employerId", TokenManager.getUserId());
 		return (Pagination<DemandListBo>) findPage("selectDemandListByPage", "selectDemandListCount", params, pageNo, pageSize);
 	}
 

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

@@ -16,6 +16,10 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		uid;
 
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer     type;
+	
 	@Size(min = 0, max = 6, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		contacts;
 
@@ -183,6 +187,12 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
 	private String companyLogoUrl;
 	
+	@Size(min = 0, max = 1, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String societyTag;
+	
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String introduction;
+	
 	public String getId() {
 		return id;
 	}
@@ -198,6 +208,14 @@ public class InputOrganizationIdentity {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+	
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
 
 	public String getContacts() {
 		return contacts;
@@ -599,4 +617,20 @@ public class InputOrganizationIdentity {
 		this.companyLogoUrl = companyLogoUrl;
 	}
 
+	public String getSocietyTag() {
+		return societyTag;
+	}
+
+	public void setSocietyTag(String societyTag) {
+		this.societyTag = societyTag;
+	}
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+
 }

+ 16 - 5
src/main/java/com/goafanti/user/bo/InputUserIdentity.java

@@ -16,6 +16,10 @@ public class InputUserIdentity {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		uid;
 
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer     type;
+	
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		username;
 
@@ -90,9 +94,8 @@ public class InputUserIdentity {
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String headPortraitUrl;
 	
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer societyTag;
+	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String societyTag;
 	
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -158,6 +161,14 @@ public class InputUserIdentity {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+	
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
 
 	public String getUsername() {
 		return username;
@@ -303,11 +314,11 @@ public class InputUserIdentity {
 		this.headPortraitUrl = headPortraitUrl;
 	}
 
-	public Integer getSocietyTag() {
+	public String getSocietyTag() {
 		return societyTag;
 	}
 
-	public void setSocietyTag(Integer societyTag) {
+	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -1,5 +1,5 @@
 package com.goafanti.user.bo;
 
 public class UserIdentityBo extends InputUserIdentity {
-
+	
 }

+ 21 - 22
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -16,15 +16,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.druid.sql.parser.Token;
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.IdentityProcess;
 import com.goafanti.common.enums.OrgProFields;
-import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.OrganizationTechFields;
 import com.goafanti.common.enums.UserAbilityFields;
 import com.goafanti.common.enums.UserAuthentication;
@@ -47,14 +44,12 @@ import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.user.bo.InputOrgPro;
 import com.goafanti.user.bo.InputOrganizationIdentity;
 import com.goafanti.user.bo.InputOrganizationTech;
-import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserCareer;
 import com.goafanti.user.bo.InputUserEdu;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.UserContactBo;
-import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationTechService;
 import com.goafanti.user.service.UserAbilityService;
@@ -391,8 +386,7 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/getUserDetail", method = RequestMethod.GET)
 	public Result getUserDetail() {
 		Result res = new Result();
-		UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(TokenManager.getUserId());
-		res.setData(u);
+		res.setData(userIdentityService.selectUserIdentityBoByUserId(TokenManager.getUserId()));
 		return res;
 	}
 	
@@ -411,17 +405,17 @@ public class UserApiController extends BaseApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (StringUtils.isBlank(userIdentity.getId())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "认证信息ID"));
-			return res;
-		}
 		if(StringUtils.isBlank(userIdentity.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
 			return res;
 		}
-		if(userIdentity.getAuthentication() == UserAuthentication.PERSON_AUTHENTICATION.getCode()){
+		if(userIdentity.getAuthentication() == UserAuthentication.AUTHENTICATION.getCode()
+				&& userIdentity.getType() == UserType.ORGANIZATION.getCode()){
 			res.getError().add(buildError(null, "", "用户已经企业认证"));
 			return res;
+		}else if(userIdentity.getAuthentication() == UserAuthentication.UN_AUTHENTICATION.getCode()){
+			userIdentity.setType(UserType.PERSONAL.getCode());
+			userIdentity.setAuthentication(UserAuthentication.AUTHENTICATION.getCode());
 		}
 		if (res.getError().isEmpty()) {
 			UserIdentity ui = new UserIdentity();
@@ -433,9 +427,11 @@ public class UserApiController extends BaseApiController {
 				ui.setId(UUID.randomUUID().toString());
 				ui.setUid(TokenManager.getUserId());
 				userIdentityService.insert(ui);
-			} else {	
+			} else {
+				ui.setId(u.getId());
 				userIdentityService.updateByPrimaryKeySelective(ui);
 			}
+			user.setId(TokenManager.getUserId());
 			userService.updateByPrimaryKeySelective(user);
 		}
 		res.setData(userIdentity);
@@ -469,31 +465,33 @@ public class UserApiController extends BaseApiController {
 					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (StringUtils.isBlank(organizationIdentity.getId())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "认证信息ID"));
-			return res;
-		}
 		if(StringUtils.isBlank(organizationIdentity.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
 			return res;
 		}
-		if(organizationIdentity.getAuthentication() == UserAuthentication.PERSON_AUTHENTICATION.getCode()){
+		if(organizationIdentity.getAuthentication() == UserAuthentication.AUTHENTICATION.getCode()
+				&& organizationIdentity.getType() == UserType.PERSONAL.getCode()){
 			res.getError().add(buildError(null, "", "用户已经个人认证"));
 			return res;
+		}else if(organizationIdentity.getAuthentication() == UserAuthentication.UN_AUTHENTICATION.getCode()){
+			organizationIdentity.setType(UserType.ORGANIZATION.getCode());
+			organizationIdentity.setAuthentication(UserAuthentication.AUTHENTICATION.getCode());
 		}
 		if (res.getError().isEmpty()) {
 			OrganizationIdentity oi = new OrganizationIdentity();
 			User user = new User();
 			BeanUtils.copyProperties(organizationIdentity, oi);
 			BeanUtils.copyProperties(organizationIdentity, user);
-			OrgIdentityBo u = organizationIdentityService.selectOrgIdentityBoByUserId(TokenManager.getUserId());
+			OrganizationIdentity u = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 			if (null == u) {
 				oi.setId(UUID.randomUUID().toString());
 				oi.setUid(TokenManager.getUserId());
 				organizationIdentityService.insert(oi);
-			} else {	
+			} else {
+				oi.setId(u.getId());
 				organizationIdentityService.updateByPrimaryKeySelective(oi);
 			}
+			user.setId(TokenManager.getUserId());
 			userService.updateByPrimaryKeySelective(user);
 		}
 		res.setData(organizationIdentity);
@@ -598,14 +596,14 @@ public class UserApiController extends BaseApiController {
 	public Result updateUserBase(String identifyName,String mobile,String email,String nickname){
 		Result res = new Result();
 		if(StringUtils.isBlank(identifyName) || StringUtils.isBlank(mobile)
-				|| StringUtils.isBlank(email) || StringUtils.isBlank(nickname)){
+				||StringUtils.isBlank(nickname)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"用户信息不全"));
 		}
 		User user = new User();
 		user.setId(TokenManager.getUserId());
 		user.setIdentifyName(identifyName);
 		user.setMobile(mobile);
-		user.setEmail(email);
+		if(StringUtils.isNotBlank(email))user.setEmail(email);
 		user.setNickname(nickname);
 		userService.updateByPrimaryKeySelective(user);
 		return res;
@@ -764,6 +762,7 @@ public class UserApiController extends BaseApiController {
 		if(userContactService.checkUserContact(TokenManager.getUserId(), bo.getMobile())){
 			res.getError().add(buildError(ErrorConstants.USER_CONTACT_ALREADY_EXIST,"联系人已存在"));
 		}
+		bo.setUid(TokenManager.getUserId());
 		userContactService.insertSelective(bo);
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/user/service/impl/UserContactServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrganizationContactBookMapper;
@@ -14,6 +15,7 @@ import com.goafanti.user.service.UserContactService;
 @Service
 public class UserContactServiceImpl implements UserContactService {
 	
+	@Autowired
 	private OrganizationContactBookMapper organizationContactBookMapper;
 	
 	@Override