Преглед на файлове

Merge branch 'test' of jishutao/jitao-server into prod

gitadmin преди 7 години
родител
ревизия
470e371446

+ 2 - 0
src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java

@@ -30,6 +30,8 @@ public class AdminJtBusinessController extends CertifyApiController{
 	
 	@Resource JtBusinessServiceWithCategoryMapper JtBusinessServiceWithCategoryMapper;
 	
+
+	
 	/*
 	 * 删除品类
 	 * 

+ 149 - 0
src/main/java/com/goafanti/business/controller/UserJtBusinessController.java

@@ -0,0 +1,149 @@
+package com.goafanti.business.controller;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.business.service.JtBusinessService;
+import com.goafanti.business.service.JtBusinessServiceWithCategoryMapper;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.model.JtBusinessCategory;
+import com.goafanti.common.model.JtBusinessProject;
+
+@RestController
+@RequestMapping(value = "/api/user/jtBusiness")
+public class UserJtBusinessController extends CertifyApiController{
+	
+	@Resource 
+	private JtBusinessService jtBusinessService;
+	
+	@Resource JtBusinessServiceWithCategoryMapper JtBusinessServiceWithCategoryMapper;
+	/*
+	 * 
+	 * 新增项目
+	 * 
+	 * */
+	@RequestMapping(value="/project/apply",method=RequestMethod.POST)
+	private Result insertJtBusinessProject(JtBusinessProject jtBusinessProject) {
+		Result result=new Result();
+		disposeProjectParam(result, jtBusinessProject);
+		if(result.getError().size()<=0) {
+			result.setData(jtBusinessService.insertProject(jtBusinessProject));
+		}
+		return result;
+		
+	}
+	private void disposeProjectParam(Result result,JtBusinessProject jtBusinessProject ) {
+		if(jtBusinessProject.getName() == null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "名称不可为空", "名称"));
+			return ;
+		}
+		if(jtBusinessProject.getCategoryId() == null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "品类"));
+			return ;
+		}
+		//todo  判断品类是否存在
+		JtBusinessCategory jtBusinessCategory=jtBusinessService.getCategoryById(jtBusinessProject.getCategoryId());
+		if(jtBusinessCategory==null ||jtBusinessCategory.getLayer()!=2) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "二级品类未找到"));
+			return ;
+		}
+		
+		if(jtBusinessProject.getProvince()==null)
+		{
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "省份"));
+			return ;
+		}
+//		if(jtBusinessProject.getCity()==null)
+//		{
+//			result.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "城市"));
+//			return ;
+//		}
+//		if(jtBusinessProject.getPrice()==null)
+//		{
+//			result.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "价格"));
+//			return ;
+//		}
+		return ;
+	}
+	
+	/*
+	 * 项目详情
+	 * 
+	 * */
+	@RequestMapping(value="/project/detail",method=RequestMethod.GET)
+	private Result getProjectDetail(String id) {
+		Result result=new Result();
+		if(id == null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","id不能为空,"));
+			return result;
+		}
+		result.setData(jtBusinessService.getBusinessProjectDetail(id));
+		return result;
+	}
+	
+	/*
+	 * 删除项目
+	 * */
+	@RequestMapping(value="/project/delete",method=RequestMethod.GET)
+	private Result deleteProjecById(String id) {
+		Result result=new Result();
+		if(id == null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","id不能为空,"));
+			return result;
+		}
+		result.setData(jtBusinessService.deleteProjectById(id));
+		return result;
+	}
+	
+	@RequestMapping(value="/project/update",method=RequestMethod.POST)
+	private Result updateProject(JtBusinessProject jtBusinessProject) {
+		Result result=new Result();
+		jtBusinessProject.setCreateTime(null);
+//		jtBusinessProject.setId(null);
+		jtBusinessProject.setNumber(null);
+		disposeProjectParam(result, jtBusinessProject);
+		if(result.getError().size()>0) {
+			return result;
+		}
+		if(jtBusinessProject.getPrice()==null) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "价格不可为空,"));
+		}
+		jtBusinessService.updateProject(jtBusinessProject);
+		return result;
+	}
+	
+
+	
+	@RequestMapping(value = "/project/uploadPicture", method = RequestMethod.POST)
+	public Result uploadProjectPicture(HttpServletRequest req, String sign) {
+		Result res = new Result();
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+
+		if (attachmentType == AttachmentType.JT_PROJECT_PICTURE
+				) {
+			res.setData(handleFiles(res, "/jtProjects/", false, req, sign, ""));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "图片"));
+		}
+		return res;
+	}
+	
+	/*
+	 * 查询品类
+	 * 
+	 * */
+	@RequestMapping(value="/category/list",method=RequestMethod.GET)
+	private Result getCategoryList(JtBusinessCategory jtBusinessCategory,Integer pageNo,Integer pageSize) {
+		Result result=new Result();
+	
+		 result.setData(JtBusinessServiceWithCategoryMapper.getCategoryListByCondition(jtBusinessCategory,pageNo,pageSize));
+		 return result;
+	}
+}

Файловите разлики са ограничени, защото са твърде много
+ 639 - 559
src/main/java/com/goafanti/common/controller/PublicController.java


+ 463 - 462
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -1,463 +1,464 @@
-<?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.JtBusinessCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JtBusinessCategory">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="summary" jdbcType="VARCHAR" property="summary" />
-    <result column="number" jdbcType="VARCHAR" property="number" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="super_id" jdbcType="VARCHAR" property="superId" />
-    <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
-    <result column="layer" jdbcType="INTEGER" property="layer" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </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 Wed Jun 20 11:08:54 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 Wed Jun 20 11:08:54 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 Wed Jun 20 11:08:54 CST 2018.
-    -->
-    id, name, summary, number, create_time, super_id, img_url, layer, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jt_business_category
-    <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 Wed Jun 20 11:08:54 CST 2018.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from jt_business_category
-    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 Wed Jun 20 11:08:54 CST 2018.
-    -->
-    delete from jt_business_category
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    delete from jt_business_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.JtBusinessCategory">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    insert into jt_business_category (id, name, summary, 
-      number, create_time, super_id, 
-      img_url, layer, sort
-      )
-    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, 
-      #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{superId,jdbcType=VARCHAR}, 
-      #{imgUrl,jdbcType=VARCHAR}, #{layer,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessCategory">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    insert into jt_business_category
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="summary != null">
-        summary,
-      </if>
-      <if test="number != null">
-        number,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="superId != null">
-        super_id,
-      </if>
-      <if test="imgUrl != null">
-        img_url,
-      </if>
-      <if test="layer != null">
-        layer,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="summary != null">
-        #{summary,jdbcType=VARCHAR},
-      </if>
-      <if test="number != null">
-        #{number,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="superId != null">
-        #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="imgUrl != null">
-        #{imgUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="layer != null">
-        #{layer,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    select count(*) from jt_business_category
-    <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 Wed Jun 20 11:08:54 CST 2018.
-    -->
-    update jt_business_category
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.summary != null">
-        summary = #{record.summary,jdbcType=VARCHAR},
-      </if>
-      <if test="record.number != null">
-        number = #{record.number,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.superId != null">
-        super_id = #{record.superId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.imgUrl != null">
-        img_url = #{record.imgUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.layer != null">
-        layer = #{record.layer,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </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 Wed Jun 20 11:08:54 CST 2018.
-    -->
-    update jt_business_category
-    set id = #{record.id,jdbcType=VARCHAR},
-      name = #{record.name,jdbcType=VARCHAR},
-      summary = #{record.summary,jdbcType=VARCHAR},
-      number = #{record.number,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      super_id = #{record.superId,jdbcType=VARCHAR},
-      img_url = #{record.imgUrl,jdbcType=VARCHAR},
-      layer = #{record.layer,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JtBusinessCategory">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    update jt_business_category
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="summary != null">
-        summary = #{summary,jdbcType=VARCHAR},
-      </if>
-      <if test="number != null">
-        number = #{number,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="superId != null">
-        super_id = #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="imgUrl != null">
-        img_url = #{imgUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="layer != null">
-        layer = #{layer,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JtBusinessCategory">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
-    -->
-    update jt_business_category
-    set name = #{name,jdbcType=VARCHAR},
-      summary = #{summary,jdbcType=VARCHAR},
-      number = #{number,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      super_id = #{superId,jdbcType=VARCHAR},
-      img_url = #{imgUrl,jdbcType=VARCHAR},
-      layer = #{layer,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
-  <select id="getBusinessCategoryByLayerAndName" resultType="com.goafanti.common.model.JtBusinessCategory">
-select
-	id,
-	name,
-	super_id as superId
-from
-	jt_business_category
-where
-	name = #{1}
-	and layer = #{0}
-  </select>
-  
-  <select id="getBusinessCategoryBySuperId" resultType="com.goafanti.common.model.JtBusinessCategory">
-  select
-	id,
-	name,
-	super_id as superId,
-	sort
-from
-	jt_business_category
-where
-
-<if test="superId!=null">
-	super_id = #{superId,jdbcType=VARCHAR}
-	</if>
-	<if  test="superId==null" >
-	layer=1
-	</if>
-
-	order by sort
-	<if test="size!=null">
-	limit #{size,jdbcType=INTEGER}
-	</if>
-  </select>
-  
- <select id="getCategoryTree" resultType="com.goafanti.business.bo.JtBusinessCategoryTree">
-  select
-	jt1.name as topLevel,
-	jt2.name as secondLevel
-from
-	jt_business_category jt2
-left join jt_business_category jt1 on
-	jt2.super_id = jt1.id
-where
-	jt2.layer = 2
-	and jt1.layer = 1
-	and jt2.id = #{0}
- </select>
- <select id="getCategoryBySuperId" resultType="com.goafanti.common.model.JtBusinessCategory">
-  select
-	id,
-	name,
-	super_id as superId,
-	sort
-from
-	jt_business_category
-where
-	super_id = #{0}
-	order by sort
-  </select>
-  <resultMap type="com.goafanti.business.bo.JtBusinessCategoryBo" id="JtBusinessCategoryBoResult">  
-        <id column="name" property="topLevel"/>  
-        <id column="topLevelId"   property="topLevelId"/>
-        <collection property="children" select="getCategoryBySuperId" column="topLevelId" ofType="com.goafanti.common.model.JtBusinessCategory">
-        </collection>  
-    </resultMap>  
-    
-    <select id="getCategoryBoList" resultMap="JtBusinessCategoryBoResult">
-    select 
-    name as topLevel,
-    id as topLevelId
-    from jt_business_category
-    where layer=1
-    order by sort
-    </select>
-    
-  <update id="autoIncreaseSort">
-update jt_business_category set 
-sort=sort+1 
-where sort > #{1}
-and layer=#{0}
-  </update>
-  
-    <select id="getCategoryListByCondition" resultType="com.goafanti.common.model.JtBusinessCategoryResult">
-   select bc1.id,bc1.sort,bc1.number,bc1.name,bc1.super_id as superId,bc1.layer,bc2.name as superName
-    from jt_business_category bc1
-    left join jt_business_category bc2 on bc2.id=bc1.super_id
-    where 
-    1=1 
-    <if test="layer!=null">
-    and bc1.layer=#{layer,jdbcType=INTEGER}</if>
-    <if test="name!=null">
-    and bc1.name like concat("%",#{name,jdbcType=VARCHAR},"%")
-    </if>
-   <if test="page_sql!=null">
-		${page_sql}
-	</if>
-    </select>
-    
-    <select id="getCategoryCountByCondition" resultType="java.lang.Integer">
-    select
-    count(0)
-      from jt_business_category bc1
-    left join jt_business_category bc2 on bc2.id=bc1.super_id
-    where 
-    1=1 
-    <if test="layer!=null">
-    and bc1.layer=#{layer,jdbcType=INTEGER}</if>
-    <if test="name!=null">
-    and bc1.name like concat("%",#{name,jdbcType=VARCHAR},"%")
-    </if>
-    </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.JtBusinessCategoryMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JtBusinessCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
+    <result column="number" jdbcType="VARCHAR" property="number" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="super_id" jdbcType="VARCHAR" property="superId" />
+    <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
+    <result column="layer" jdbcType="INTEGER" property="layer" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+  </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 Wed Jun 20 11:08:54 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 Wed Jun 20 11:08:54 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 Wed Jun 20 11:08:54 CST 2018.
+    -->
+    id, name, summary, number, create_time, super_id, img_url, layer, sort
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jt_business_category
+    <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 Wed Jun 20 11:08:54 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from jt_business_category
+    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 Wed Jun 20 11:08:54 CST 2018.
+    -->
+    delete from jt_business_category
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    delete from jt_business_category
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.JtBusinessCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    insert into jt_business_category (id, name, summary, 
+      number, create_time, super_id, 
+      img_url, layer, sort
+      )
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, 
+      #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{superId,jdbcType=VARCHAR}, 
+      #{imgUrl,jdbcType=VARCHAR}, #{layer,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    insert into jt_business_category
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="superId != null">
+        super_id,
+      </if>
+      <if test="imgUrl != null">
+        img_url,
+      </if>
+      <if test="layer != null">
+        layer,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="summary != null">
+        #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="superId != null">
+        #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="imgUrl != null">
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="layer != null">
+        #{layer,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    select count(*) from jt_business_category
+    <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 Wed Jun 20 11:08:54 CST 2018.
+    -->
+    update jt_business_category
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.summary != null">
+        summary = #{record.summary,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null">
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.superId != null">
+        super_id = #{record.superId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.imgUrl != null">
+        img_url = #{record.imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.layer != null">
+        layer = #{record.layer,jdbcType=INTEGER},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </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 Wed Jun 20 11:08:54 CST 2018.
+    -->
+    update jt_business_category
+    set id = #{record.id,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      summary = #{record.summary,jdbcType=VARCHAR},
+      number = #{record.number,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      super_id = #{record.superId,jdbcType=VARCHAR},
+      img_url = #{record.imgUrl,jdbcType=VARCHAR},
+      layer = #{record.layer,jdbcType=INTEGER},
+      sort = #{record.sort,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JtBusinessCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    update jt_business_category
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="imgUrl != null">
+        img_url = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="layer != null">
+        layer = #{layer,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JtBusinessCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    update jt_business_category
+    set name = #{name,jdbcType=VARCHAR},
+      summary = #{summary,jdbcType=VARCHAR},
+      number = #{number,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      super_id = #{superId,jdbcType=VARCHAR},
+      img_url = #{imgUrl,jdbcType=VARCHAR},
+      layer = #{layer,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="getBusinessCategoryByLayerAndName" resultType="com.goafanti.common.model.JtBusinessCategory">
+select
+	id,
+	name,
+	super_id as superId
+from
+	jt_business_category
+where
+	name = #{1}
+	and layer = #{0}
+	order by create_time desc
+  </select>
+  
+  <select id="getBusinessCategoryBySuperId" resultType="com.goafanti.common.model.JtBusinessCategory">
+  select
+	id,
+	name,
+	super_id as superId,
+	sort
+from
+	jt_business_category
+where
+
+<if test="superId!=null">
+	super_id = #{superId,jdbcType=VARCHAR}
+	</if>
+	<if  test="superId==null" >
+	layer=1
+	</if>
+
+	order by sort
+	<if test="size!=null">
+	limit #{size,jdbcType=INTEGER}
+	</if>
+  </select>
+  
+ <select id="getCategoryTree" resultType="com.goafanti.business.bo.JtBusinessCategoryTree">
+  select
+	jt1.name as topLevel,
+	jt2.name as secondLevel
+from
+	jt_business_category jt2
+left join jt_business_category jt1 on
+	jt2.super_id = jt1.id
+where
+	jt2.layer = 2
+	and jt1.layer = 1
+	and jt2.id = #{0}
+ </select>
+ <select id="getCategoryBySuperId" resultType="com.goafanti.common.model.JtBusinessCategory">
+  select
+	id,
+	name,
+	super_id as superId,
+	sort
+from
+	jt_business_category
+where
+	super_id = #{0}
+	order by sort
+  </select>
+  <resultMap type="com.goafanti.business.bo.JtBusinessCategoryBo" id="JtBusinessCategoryBoResult">  
+        <id column="name" property="topLevel"/>  
+        <id column="topLevelId"   property="topLevelId"/>
+        <collection property="children" select="getCategoryBySuperId" column="topLevelId" ofType="com.goafanti.common.model.JtBusinessCategory">
+        </collection>  
+    </resultMap>  
+    
+    <select id="getCategoryBoList" resultMap="JtBusinessCategoryBoResult">
+    select 
+    name as topLevel,
+    id as topLevelId
+    from jt_business_category
+    where layer=1
+    order by sort
+    </select>
+    
+  <update id="autoIncreaseSort">
+update jt_business_category set 
+sort=sort+1 
+where sort > #{1}
+and layer=#{0}
+  </update>
+  
+    <select id="getCategoryListByCondition" resultType="com.goafanti.common.model.JtBusinessCategoryResult">
+   select bc1.id,bc1.sort,bc1.number,bc1.name,bc1.super_id as superId,bc1.layer,bc2.name as superName
+    from jt_business_category bc1
+    left join jt_business_category bc2 on bc2.id=bc1.super_id
+    where 
+    1=1 
+    <if test="layer!=null">
+    and bc1.layer=#{layer,jdbcType=INTEGER}</if>
+    <if test="name!=null">
+    and bc1.name like concat("%",#{name,jdbcType=VARCHAR},"%")
+    </if>
+   <if test="page_sql!=null">
+		${page_sql}
+	</if>
+    </select>
+    
+    <select id="getCategoryCountByCondition" resultType="java.lang.Integer">
+    select
+    count(0)
+      from jt_business_category bc1
+    left join jt_business_category bc2 on bc2.id=bc1.super_id
+    where 
+    1=1 
+    <if test="layer!=null">
+    and bc1.layer=#{layer,jdbcType=INTEGER}</if>
+    <if test="name!=null">
+    and bc1.name like concat("%",#{name,jdbcType=VARCHAR},"%")
+    </if>
+    </select>
 </mapper>

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

@@ -498,6 +498,7 @@
   	jt_business_project
   	where 
   	category_id=#{0}
+  	 order by create_time
   	limit #{1}
   </select>
   

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

@@ -949,7 +949,7 @@
 		LEFT JOIN user_career uc ON uc.uid = u.id
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
-			u.type = 0 and ui.expert = 1
+			ui.expert = 1 and u.source=0
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>
@@ -969,7 +969,7 @@
 			AND ui.area = #{area,jdbcType=INTEGER}
 		</if>
 		<if test="field != null">
-			AND uc.engaged_field like CONCAT(#{field,jdbcType=VARCHAR}, '%')
+			AND ui.industry= #{field,jdbcType=VARCHAR}
 		</if>
 		<if test="name != null">
 			AND ui.username like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
@@ -989,7 +989,7 @@
 		LEFT JOIN user_career uc ON uc.uid = u.id
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
-			u.type = 0 and ui.expert = 1
+		 ui.expert = 1 and u.source=0
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>
@@ -1009,7 +1009,7 @@
 			AND ui.area = #{area,jdbcType=INTEGER}
 		</if>
 		<if test="field != null">
-			AND uc.engaged_field like CONCAT(#{field,jdbcType=VARCHAR}, '%')
+			AND ui.industry= #{field,jdbcType=VARCHAR}
 		</if>
 		<if test="name != null">
 			AND ui.username like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')

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

@@ -1150,7 +1150,7 @@
 		left join user_edu e on u.id=e.uid
 		left join industry_category ic on i.industry=ic.id
 		WHERE
-		u.type = 0
+		u.source=0 and i.expert=1
 		<if test="_parameter!= null">
 			and u.id= #{_parameter,jdbcType=VARCHAR}
 		</if>
@@ -1170,7 +1170,7 @@
 		<!-- left join user_info info on u.id=info.uid -->
 		left join user_ability ua on u.id=ua.uid
 		WHERE
-		u.type = 0
+		u.source =0 and i.expert=1
 		limit 0,50
 	</select>
 </mapper>

+ 73 - 89
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -1,89 +1,73 @@
-package com.goafanti.portal.controller;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.goafanti.achievement.service.AchievementService;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.BaseController;
-import com.goafanti.common.enums.AchievementMaturity;
-import com.goafanti.common.enums.DemandPortalSearchSignType;
-import com.goafanti.common.enums.UserLevel;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.demand.service.DemandService;
-import com.goafanti.portal.bo.AchievementSearchListBo;
-import com.goafanti.portal.bo.BoutiqueListBo;
-import com.goafanti.user.service.OrganizationIdentityService;
-import com.goafanti.user.service.UserIdentityService;
-
-@RestController
-@RequestMapping(value = "/portal/search")
-public class PortalSearchController extends BaseController {
-	@Resource
-	private AchievementService			achievementService;
-	@Resource
-	private DemandService				demandService;
-	@Resource
-	private UserIdentityService			userIdentityService;
-	@Resource
-	private OrganizationIdentityService	organizationIdentityService;
-
-
-		
-		
-
-		
-
-
-
-	/**
-	 * 用户搜索
-	 */
-	@RequestMapping(value = "/subscriberList", method = RequestMethod.GET)
-	public Result subscriberSearchList(HttpServletRequest req,String name, Integer level, Integer type, String field, Integer province,
-			Integer city, Integer area,Integer international, String pageNo, String pageSize) {
-		Result res = new Result();
-		String url=req.getServerName();
-		url=url.substring(url.indexOf(".")+1, url.length());
-		if (null == type) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户类型"));
-			return res;
-		}
-
-		if (!UserType.PERSONAL.getCode().equals(type) && !UserType.ORGANIZATION.getCode().equals(type)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户类型"));
-			return res;
-		}
-
-		if (null != level && !UserLevel.GENERAL.getCode().equals(level)
-				&& !UserLevel.CERTIFIED.getCode().equals(level)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户认证标记"));
-			return res;
-		}
-		Integer pNo = 1;
-		Integer pSize = 12;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		if (UserType.PERSONAL.getCode().equals(type)) {
-			res.setData(userIdentityService.listSubscriber(url,name, level, field, province, city, area, international, pNo, pSize));
-		} else {
-		}
-		return res;
-	}
-	
-	
-}
+package com.goafanti.portal.controller;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.enums.AchievementMaturity;
+import com.goafanti.common.enums.DemandPortalSearchSignType;
+import com.goafanti.common.enums.UserLevel;
+import com.goafanti.common.enums.UserType;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.demand.service.DemandService;
+import com.goafanti.portal.bo.AchievementSearchListBo;
+import com.goafanti.portal.bo.BoutiqueListBo;
+import com.goafanti.user.service.OrganizationIdentityService;
+import com.goafanti.user.service.UserIdentityService;
+
+@RestController
+@RequestMapping(value = "/portal/search")
+public class PortalSearchController extends BaseController {
+	@Resource
+	private AchievementService			achievementService;
+	@Resource
+	private DemandService				demandService;
+	@Resource
+	private UserIdentityService			userIdentityService;
+	@Resource
+	private OrganizationIdentityService	organizationIdentityService;
+
+
+		
+		
+
+		
+
+
+
+	/**
+	 * 用户搜索
+	 */
+	@RequestMapping(value = "/subscriberList", method = RequestMethod.GET)
+	public Result subscriberSearchList(HttpServletRequest req,String name, Integer level, Integer type, String field, Integer province,
+			Integer city, Integer area,Integer international, String pageNo, String pageSize) {
+		Result res = new Result();
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
+		Integer pNo = 1;
+		Integer pSize = 12;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+	
+			res.setData(userIdentityService.listSubscriber(url,name, level, field, province, city, area, international, pNo, pSize));
+	
+		return res;
+	}
+	
+	
+}

Файловите разлики са ограничени, защото са твърде много
+ 884 - 883
src/main/java/com/goafanti/user/controller/UserApiController.java


+ 1 - 23
src/main/webapp/WEB-INF/views/common.html

@@ -197,12 +197,6 @@
 		<div class="pub_fix">
 			<span class="index_blur"></span>
 			<ul class="ret_top">
-				<li class="head_login">
-					<a href="javascript:;">
-						<img th:src="${portalHost+'/img/index_fix0.png'}" alt="" />
-						<p>申请会员</p>
-					</a>
-				</li>
 				<li>
 					<a onclick="_MEIQIA('showPanel')">
 						<img th:src="${portalHost+'/img/index_fix3.png'}" alt="" />
@@ -248,7 +242,7 @@
 							<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 						</div>
 						<div class="login_check">
-						
+<!-- 						<a href="#">忘记密码?</a> -->
 						</div>
 						<input type="submit" value="登 陆" class="login_submit"/>
 					</form>
@@ -263,14 +257,6 @@
 				<form id="forget_form">
 					<div class="forget_top">
 						<a href="">忘记密码?</a>
-						<div class="login_check">
-							<label for="forget_checks" class="lab_check">
-								<input type="checkbox" name="type" id="forget_checks" />专家登录
-							</label>
-							<label for="forget_checkst" class="lab_checkno">
-								<input type="checkbox" name="type" id="forget_checkst" />企业登录
-							</label>
-						</div>
 					</div>
 					<div class="forget_center">
 						<div class="phone">
@@ -278,14 +264,6 @@
 								手机号码:<input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..."/>
 							</label>
 						</div>
-						<div  class="yanzheng">
-							<label for="forget_yanzheng">
-								图形验证码:<input type="text" name="type" id="forget_yanzheng" />
-							</label>
-							<div class="yanzhengma_cont_">
-								<img th:src="${basePath+'/open/getVCode'}"/>
-							</div>
-						</div>
 						<div class="cellcode_">
 							<div>
 								验证码:<input type="text" name="cellCode" placeholder="手机验证码" id="photo_n"/>

+ 8 - 7
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -43,12 +43,13 @@
 				<div>
 				<span>擅长领域</span>
 				<span class="lingyu" th:text="${rePartnerDetail.abilityLabel}?${rePartnerDetail.abilityLabel}:未知"></span>
-				<span class="box_love"></span>
-				<span class="dem_number">0</span>
-				<span class="shoucang">收藏</span>
-				<span class="yuejian">线下约见</span>
-				<span class="cishu">32</span>
-				<span class="ci">次</span>
+<!-- 				<span class="box_love"></span> -->
+<!-- 				<span class="dem_number">0</span> -->
+<!-- 				<span class="shoucang">收藏</span> -->
+<!-- 				<span class="yuejian">线下约见</span> -->
+<!-- 				<span class="cishu">32</span> -->
+<!-- 				<span class="ci">次</span>  -->
+			
 				</div>
 			</div>
 		</div>
@@ -76,7 +77,7 @@
 		</div>
 		<div class="achieve_btn">
 			<a onclick="_MEIQIA('showPanel')">线下约见</a>
-			<a id="consultBtn">在线咨询</a>
+<!-- 			<a id="consultBtn">在线咨询</a> -->
 			<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
 		</div>
 	</div>