Просмотр исходного кода

发布成果、需求、专家显示SQL更换

anderx лет назад: 8
Родитель
Сommit
685964683f

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -53,7 +53,7 @@ public interface AchievementService {
 
 
 	void insertImport(List<AchievementImportBo> data);
 	void insertImport(List<AchievementImportBo> data);
 
 
-	Pagination<AchievementSearchListBo> listAchievementSearchList(
+	Pagination<AchievementSearchListBo> listAchievementSearchList(String url,
 			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
 			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
 			Integer timeSort,String upperPrice,String lowerPrice,Integer internationalFlag);
 			Integer timeSort,String upperPrice,String lowerPrice,Integer internationalFlag);
 
 

+ 4 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -519,10 +519,13 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<AchievementSearchListBo> listAchievementSearchList(String keyword, Integer dataCategory,
+	public Pagination<AchievementSearchListBo> listAchievementSearchList(String url,String keyword, Integer dataCategory,
 			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
 			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
 			String upperPrice, String lowerPrice,Integer internationalFlag) {
 			String upperPrice, String lowerPrice,Integer internationalFlag) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
+		if (!StringUtils.isBlank(url)) {
+			params.put("url", url);
+		}
 		if (!StringUtils.isBlank(keyword)) {
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 			params.put("keyword", keyword);
 		}
 		}

+ 3 - 3
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -231,11 +231,11 @@ public class WebpageController extends BaseController {
 		}
 		}
 		//modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2));
 		//modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2));
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
-		List<MarketingManagementBo> achievementList = marketingManagementService.selectMarketList(
+		List<MarketingManagementBo> achievementList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
 				MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
-		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(
+		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType());
 				MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType());
-		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(
+		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(request,
 				MarketingPage.specialist.getPageUrl(), MarketingPage.specialist.getBoothType());
 				MarketingPage.specialist.getPageUrl(), MarketingPage.specialist.getBoothType());
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
 		modelview.addObject("demandList", demandList);

+ 1 - 1
src/main/java/com/goafanti/common/dao/MarketingManagementMapper.java

@@ -125,5 +125,5 @@ public interface MarketingManagementMapper {
 	 * @param category
 	 * @param category
 	 * @return
 	 * @return
 	 */
 	 */
-	List<MarketingManagementBo> selectMarketList(@Param("showPage")String showPage, @Param("category")Integer category);
+	List<MarketingManagementBo> selectMarketList(@Param("url")String url,@Param("showPage")String showPage, @Param("category")Integer category);
 }
 }

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

@@ -1321,14 +1321,15 @@
   		a.transfer_mode as transferMode,
   		a.transfer_mode as transferMode,
   		a.technical_picture_url as technicalPictureUrl,
   		a.technical_picture_url as technicalPictureUrl,
   		b.name as fieldAs,
   		b.name as fieldAs,
-  		ap.publish_page,ap.publish_platform,ap.publish_client,ap.if_top,ap.top_number,ap.show_number
+  		ap.publish_page,ap.publish_platform,ap.publish_client,ap.if_top,ap.top_number,ap.show_number,bi.domain_name
   	from achievement a 
   	from achievement a 
   	right join achievement_publish ap on a.id=ap.achievement_id
   	right join achievement_publish ap on a.id=ap.achievement_id
+  	left join branch_information bi on bi.id=ap.publish_platform
   	left join field_glossory b on a.field_a = b.id
   	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	where a.deleted_sign = 0 
   	and ap.publish_client=0
   	and ap.publish_client=0
 	and ap.publish_page='W02'
 	and ap.publish_page='W02'
-	and ap.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+	and bi.domain_name like '%#{url,jdbcType=VARCHAR}%'
   	<if test="dataCategory != null and dataCategory != ''">
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>
   	</if>
@@ -1368,13 +1369,14 @@
   <select id="findSearchAchievementCount" parameterType="String" resultType="java.lang.Integer">
   <select id="findSearchAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
   	select 
   		count(1)
   		count(1)
-  	from achievement a 
+  from achievement a 
   	right join achievement_publish ap on a.id=ap.achievement_id
   	right join achievement_publish ap on a.id=ap.achievement_id
+  	left join branch_information bi on bi.id=ap.publish_platform
   	left join field_glossory b on a.field_a = b.id
   	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	where a.deleted_sign = 0 
   	and ap.publish_client=0
   	and ap.publish_client=0
 	and ap.publish_page='W02'
 	and ap.publish_page='W02'
-	and ap.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+	and bi.domain_name like  "%"#{url,jdbcType=VARCHAR}"%"
   	<if test="dataCategory != null and dataCategory != ''">
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>
   	</if>

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

@@ -1051,11 +1051,12 @@
 	  	 	u.lvl as level,dp.publish_page,dp.publish_platform,dp.publish_client,dp.if_top,dp.top_number,dp.show_number
 	  	 	u.lvl as level,dp.publish_page,dp.publish_platform,dp.publish_client,dp.if_top,dp.top_number,dp.show_number
   		from demand d
   		from demand d
   		right join demand_publish dp on d.id=dp.demand_id
   		right join demand_publish dp on d.id=dp.demand_id
+  		left join branch_information bi on bi.id=dp.publish_platform
   		left join user u on u.id = d.employer_id
   		left join user u on u.id = d.employer_id
   		where d.deleted_sign = 0 and d.status = 0
   		where d.deleted_sign = 0 and d.status = 0
   		and dp.publish_client=0
   		and dp.publish_client=0
 		and dp.publish_page='W02'
 		and dp.publish_page='W02'
-		and dp.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+		and bi.domain_name like  "%"#{url,jdbcType=VARCHAR}"%"
 		<if test="keyword != null">
 		<if test="keyword != null">
   			and d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   			and d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   		</if>
   		</if>

+ 32 - 7
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -353,26 +353,51 @@
   </select>
   </select>
   <select id="selectMarketList" resultType="com.goafanti.marketing.bo.MarketingManagementBo">
   <select id="selectMarketList" resultType="com.goafanti.marketing.bo.MarketingManagementBo">
   	<if test="category == 1"> <!-- 成果 -->
   	<if test="category == 1"> <!-- 成果 -->
-  		select mm.product_id as productId,x.owner_type as ownerType,x.summary,x.name,mm.cover_img as coverImg
-		from marketing_management mm left join achievement x on mm.product_id = x.id
-		where mm.effective =1 and x.audit_status=3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
+  		select
+	x.id,
+	x.owner_type as ownerType,
+	x.summary,
+	x.name,
+	x.technical_picture_url  as coverImg,
+	bi.platform_url
+from
+	 achievement x 
+right join achievement_publish ap on ap.achievement_id=x.id
+left join branch_information bi on bi.id=ap.publish_platform
+where x.audit_status = 3
+	and x.deleted_sign = 0
+	and ap.publish_client='0'
+	and ap.publish_page='W01'
+	and bi.platform_url like '%#{url,jdbcType=VARCHAR}%'
   	</if>
   	</if>
   	<if test="category == 2"> <!-- 需求 -->
   	<if test="category == 2"> <!-- 需求 -->
-  		select mm.product_id as productId,x.data_category as ownerType,x.name,mm.cover_img as coverImg,x.problem_des
-		from marketing_management mm left join demand x on mm.product_id = x.id
-		where mm.effective =1  and x.audit_status =3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
+  		select x.id as productId,x.data_category as ownerType,x.name,x.picture_url as coverImg,x.problem_des
+		from    demand x 
+		right join demand_publish dp on dp.demand_id=x.id
+		left join branch_information bi on bi.id=dp.publish_platform
+		where  x.audit_status =3 and x.deleted_sign = 0
+			and x.deleted_sign = 0
+	and dp.publish_client='0'
+	and dp.publish_page='W01'
+	and bi.domain_name like '%#{url,jdbcType=VARCHAR}%' 
   	</if>
   	</if>
   	<if test="category == 7"> <!-- 智者 -->
   	<if test="category == 7"> <!-- 智者 -->
   		select 
   		select 
   		u.id,i.username,ua.ability_label as abilityLabel,
   		u.id,i.username,ua.ability_label as abilityLabel,
-  		c.achievement,u.head_portrait_url as headPortraitUrl,u.type
+  		c.achievement,u.head_portrait_url as headPortraitUrl,u.type,i.expert 
   		from `user` u
   		from `user` u
   		left join user_ability ua on u.id=ua.uid
   		left join user_ability ua on u.id=ua.uid
   		left join user_career c on u.id=c.uid
   		left join user_career c on u.id=c.uid
   		left join user_identity i on u.id=i.uid
   		left join user_identity i on u.id=i.uid
+  		right join expert_publish ep on ep.expert_id=u.id
+  		left join branch_information bi on bi.id=ep.publish_platform
   		WHERE
   		WHERE
 		u.type = 0 and 
 		u.type = 0 and 
 		i.expert = 1	
 		i.expert = 1	
+		and ep.publish_client='0'
+		and ep.publish_page='W01'
+		and bi.domain_name like '%#{url,jdbcType=VARCHAR}%' 
+		
   	</if>
   	</if>
   </select>
   </select>
 </mapper>
 </mapper>

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

@@ -917,17 +917,17 @@
 			ui.international,
 			ui.international,
 			ep.publish_page,ep.publish_platform,ep.publish_client,ep.if_top,ep.top_number,ep.show_number
 			ep.publish_page,ep.publish_platform,ep.publish_client,ep.if_top,ep.top_number,ep.show_number
 		FROM
 		FROM
-			<![CDATA[ user ]]> u
+		 user  u
 		right join expert_publish ep on u.id=ep.expert_id
 		right join expert_publish ep on u.id=ep.expert_id
+		left join branch_information bi on bi.id=ep.publish_platform
 		LEFT JOIN user_identity ui ON ui.uid = u.id
 		LEFT JOIN user_identity ui ON ui.uid = u.id
 		LEFT JOIN user_career uc ON uc.uid = u.id
 		LEFT JOIN user_career uc ON uc.uid = u.id
-		<!-- LEFT JOIN user_info info ON info.uid = u.id -->
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
 		WHERE
 			u.type = 0 and ui.expert = 1
 			u.type = 0 and ui.expert = 1
-			and ep.publish_client=0
+		and ep.publish_client=0
 		and ep.publish_page='W02'
 		and ep.publish_page='W02'
-		and ep.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+		and bi.domain_name like  "%"#{url,jdbcType=VARCHAR}"%"
 		<if test="null != level and level==1 ">
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>
 		</if>

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -57,7 +57,7 @@ public interface DemandService {
 
 
 	void insertImport(List<DemandImportBo> data);
 	void insertImport(List<DemandImportBo> data);
 
 
-	Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
+	Pagination<DemandSearchListBo> listDemandSearchList(String url,Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer pNo, Integer pSize,Integer dateSort);
 			Integer pNo, Integer pSize,Integer dateSort);
 
 

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

@@ -482,10 +482,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
+	public Pagination<DemandSearchListBo> listDemandSearchList(String url,Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer pNo, Integer pSize, Integer dateSort) {
 			Integer pNo, Integer pSize, Integer dateSort) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
+		if (!StringUtils.isBlank(url)) {
+			params.put("url", url);
+		}
 		if (!StringUtils.isBlank(keyword)) {
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 			params.put("keyword", keyword);
 		}
 		}

+ 5 - 1
src/main/java/com/goafanti/marketing/service/MarketingManagementService.java

@@ -2,6 +2,10 @@ package com.goafanti.marketing.service;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpRequest;
+
 import com.goafanti.common.model.MarketingManagement;
 import com.goafanti.common.model.MarketingManagement;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 
 
@@ -47,5 +51,5 @@ public interface MarketingManagementService {
 	 * @param category 分类
 	 * @param category 分类
 	 * @return
 	 * @return
 	 */
 	 */
-	public List<MarketingManagementBo> selectMarketList(String showPage,Integer category);
+	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,String showPage,Integer category);
 }
 }

+ 8 - 3
src/main/java/com/goafanti/marketing/service/impl/MarketingManagementServiceImpl.java

@@ -3,6 +3,9 @@ package com.goafanti.marketing.service.impl;
 import java.util.List;
 import java.util.List;
 import java.util.UUID;
 import java.util.UUID;
 
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -42,8 +45,10 @@ public class MarketingManagementServiceImpl implements MarketingManagementServic
 	}
 	}
 
 
 	@Override
 	@Override
-	public List<MarketingManagementBo> selectMarketList(String showPage, Integer category) {
-		return marketingManagementMapper.selectMarketList(showPage, category);
+	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,String showPage, Integer category) {
+		String url=res.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
+		return marketingManagementMapper.selectMarketList(url,showPage, category);
 	}
 	}
-
+	
 }
 }

+ 14 - 7
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.List;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,12 +43,14 @@ public class PortalSearchController extends BaseController {
 	 */
 	 */
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
-	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
+	public Result achievementSearchList(HttpServletRequest req,  String keyword,Integer dataCategory,Integer category,
 			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice,
 			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice,
 			Integer internationalFlag) {
 			Integer internationalFlag) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 20;
 		Integer pSize = 20;
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
 		if(null != dateSort && dateSort != 0 && dateSort != 1){
 		if(null != dateSort && dateSort != 0 && dateSort != 1){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "时间排序"));
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "时间排序"));
 		}
 		}
@@ -71,7 +74,7 @@ public class PortalSearchController extends BaseController {
 		}
 		}
 		
 		
 		
 		
-		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( 
+		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( url,
 				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice,internationalFlag);
 				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice,internationalFlag);
 		
 		
 		
 		
@@ -110,10 +113,12 @@ public class PortalSearchController extends BaseController {
 	 * 科技需求搜索
 	 * 科技需求搜索
 	 */
 	 */
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
-	public Result demandSearchList(Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
+	public Result demandSearchList(HttpServletRequest req,Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
 			Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper, String pageNo,
 			Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper, String pageNo,
 			String pageSize,Integer dateSort) {
 			String pageSize,Integer dateSort) {
 		Result res = new Result();
 		Result res = new Result();
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 10;
 		Integer pSize = 10;
 		if (null == sign) {
 		if (null == sign) {
@@ -135,7 +140,7 @@ public class PortalSearchController extends BaseController {
 		if (StringUtils.isNumeric(pageNo)) {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 			pNo = Integer.parseInt(pageNo);
 		}
 		}
-		res.setData(demandService.listDemandSearchList(sign, keyword, industryCategoryA, industryCategoryB, demandType,
+		res.setData(demandService.listDemandSearchList(url,sign, keyword, industryCategoryA, industryCategoryB, demandType,
 				budgetCostLower, budgetCostUpper, pNo, pSize,dateSort));
 				budgetCostLower, budgetCostUpper, pNo, pSize,dateSort));
 		return res;
 		return res;
 	}
 	}
@@ -144,9 +149,11 @@ public class PortalSearchController extends BaseController {
 	 * 用户搜索
 	 * 用户搜索
 	 */
 	 */
 	@RequestMapping(value = "/subscriberList", method = RequestMethod.GET)
 	@RequestMapping(value = "/subscriberList", method = RequestMethod.GET)
-	public Result subscriberSearchList(String name, Integer level, Integer type, String field, Integer province,
+	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) {
 			Integer city, Integer area,Integer international, String pageNo, String pageSize) {
 		Result res = new Result();
 		Result res = new Result();
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
 		if (null == type) {
 		if (null == type) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户类型"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户类型"));
 			return res;
 			return res;
@@ -171,9 +178,9 @@ public class PortalSearchController extends BaseController {
 			pNo = Integer.parseInt(pageNo);
 			pNo = Integer.parseInt(pageNo);
 		}
 		}
 		if (UserType.PERSONAL.getCode().equals(type)) {
 		if (UserType.PERSONAL.getCode().equals(type)) {
-			res.setData(userIdentityService.listSubscriber(name, level, field, province, city, area, international, pNo, pSize));
+			res.setData(userIdentityService.listSubscriber(url,name, level, field, province, city, area, international, pNo, pSize));
 		} else {
 		} else {
-			res.setData(organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
+			res.setData(organizationIdentityService.listSubscriber(url,name, level, field, province, city, area, pNo, pSize));
 		}
 		}
 		return res;
 		return res;
 	}
 	}

+ 1 - 1
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -46,7 +46,7 @@ public interface OrganizationIdentityService {
 
 
 	int updateOrgDetailByAuditAdmin(OrganizationIdentity oi, String aid, String mid, Integer level);
 	int updateOrgDetailByAuditAdmin(OrganizationIdentity oi, String aid, String mid, Integer level);
 
 
-	Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
+	Pagination<OrgSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province, Integer city,
 			Integer area, Integer pNo, Integer pSize);
 			Integer area, Integer pNo, Integer pSize);
 
 
 	OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid);
 	OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid);

+ 1 - 1
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -35,7 +35,7 @@ public interface UserIdentityService {
 
 
 	int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level);
 	int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level);
 
 
-	Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
+	Pagination<UserSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province, Integer city,
 			Integer area,Integer international, Integer pNo, Integer pSize);
 			Integer area,Integer international, Integer pNo, Integer pSize);
 
 
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);

+ 4 - 2
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -221,10 +221,12 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
+	public Pagination<OrgSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province,
 			Integer city, Integer area, Integer pNo, Integer pSize) {
 			Integer city, Integer area, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
-
+		if (StringUtils.isNotBlank(url)) {
+			params.put("url", url);
+		}
 		if (StringUtils.isNotBlank(name)) {
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 			params.put("name", name);
 		}
 		}

+ 4 - 2
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -166,10 +166,12 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
+	public Pagination<UserSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province,
 			Integer city, Integer area, Integer international, Integer pNo, Integer pSize) {
 			Integer city, Integer area, Integer international, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
-
+		if (StringUtils.isNotBlank(url)) {
+			params.put("url", url);
+		}
 		if (StringUtils.isNotBlank(name)) {
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 			params.put("name", name);
 		}
 		}