Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Michael 8 years ago
parent
commit
7139f6ecc8

+ 0 - 1
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -134,7 +134,6 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		}else {
 			bp.setStatus("0");
 		}
-		
 		return businessProjectMapper.updateByPrimaryKey(bp);
 	}
 	@Override

+ 0 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -972,7 +972,6 @@ public class PortalController extends BaseController {
 		mv.setViewName("");
 		//获取首页轮播图
 		mv.addObject("serviceImages",new ServiceImages().getImagers());
-		
 		return mv;
 	}
 	/**

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

@@ -1060,8 +1060,8 @@
   </select>
   
   <select id="findConsultantListByPage" resultType="com.goafanti.app.bo.consultantListBo">
-	 select t.uid as id,t.username as username ,u.head_portrait_url as headPortraitUrl,u.introduction ,
-	  t.expert as consultant,t.celebrity,ifnull(x.n,0) as reservationCount
+	 	select t.uid as id,t.username as username ,u.head_portrait_url as headPortraitUrl,u.introduction ,
+	  t.expert as consultant,ifnull(x.n,0) as reservationCount
 	  from user_identity t
 	  left join `user` u on t.uid=u.id
 	  left join ( select y.x  as n, y.seller_id
@@ -1083,8 +1083,8 @@
   
   
   <select id="selectconsultantByUid" parameterType="java.lang.String" resultType="com.goafanti.app.bo.consultantListBo">
-  	 	select 
-  		t.uid as id ,t.username as username ,t.consultant,u.head_portrait_url as headPortraitUrl,
+  select 
+  		t.uid as id ,t.username as username ,t.expert as consultant,u.head_portrait_url as headPortraitUrl,
   		u.introduction,ifnull(o.x,0) as reservationCount,j.easemob_name as easemobName
   	from  user_identity t 
   	left join user u on t.uid =u.id