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

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

anderx лет назад: 4
Родитель
Сommit
413075d39c

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

@@ -1137,7 +1137,7 @@
 	 and a.channel=1 
     </if> 
     <if test="type == 2">
-    and a.share_type=2
+    and a.share_type=3
     </if> 
 	<if test="type == 3 or type==4">
 	and a.source=1
@@ -1185,7 +1185,7 @@
 	 and a.channel=1 
     </if> 
     <if test="type == 2">
-    and a.share_type=2
+    and a.share_type=3
     </if> 
 	<if test="type == 3 or type==4">
 	and a.source=1

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

@@ -635,7 +635,7 @@
         from admin a left join (select x.aid,x.userCount,x.channelCount,signCount,x.newCount,x.channelNewCount,x.receiveCount,
         ifnull(y.completeCount,0)completeCount,ifnull(y.channelCompleteCount,0)channelCompleteCount
         from (select aid,sum(if( share_type=0 and channel=0,1,0))userCount,
-        sum(if(share_type=0 and  channel=1,1,0))channelCount,
+        sum(if(share_type=3 and  channel=1,1,0))channelCount,
         sum(if( share_type=2 ,1,0))signCount,
         sum(if(share_type=0 and source =1  and channel=0,1,0))newCount,
         sum(if(share_type=0 and source =1  and channel=1,1,0))channelNewCount,

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

@@ -415,7 +415,7 @@
   <select id="selectFollowCountByUAid" parameterType="java.lang.String" resultType="java.lang.Integer">
   	select count(0) from user_follow where uid = #{uid,jdbcType=VARCHAR}
   	<if test="aid !=null">
-=   and aid = #{aid,jdbcType=VARCHAR}
+   and aid = #{aid,jdbcType=VARCHAR}
     </if>
   </select>
   

+ 0 - 2
src/main/java/com/goafanti/user/controller/UserChannelApiController.java

@@ -70,7 +70,6 @@ public class UserChannelApiController  extends CertifyApiController{
 	/**
 	 * 	Excel批量导入渠道客户
      * 
-     * @param response
      * @return
      */
     @RequestMapping(value = "/import" , method = RequestMethod.POST)
@@ -95,7 +94,6 @@ public class UserChannelApiController  extends CertifyApiController{
     /**
   	 * 	已存在渠道客户列表
        * 
-       * @param response
        * @return
        */
       @RequestMapping(value = "/erorrList" , method = RequestMethod.GET)