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

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

@@ -208,12 +208,10 @@
     left join district_glossory d1 on c.location_province =d1.id 
     left join district_glossory d2 on c.location_city =d2.id
     where 1=1
+    and a.status > 2
     <if test="aid !=null">
     and a.aid= #{aid} 
     </if>
-    <if test="type == 1">
-    and a.status &gt; 1
-    </if>
     <if test="page_sql != null">
     	${page_sql}
     </if>
@@ -225,12 +223,10 @@
     left join district_glossory d1 on c.location_province =d1.id 
     left join district_glossory d2 on c.location_city =d2.id
     where 1=1
+    and a.status &gt; 2
     <if test="aid !=null">
     and a.aid= #{aid} 
     </if>
-      <if test="type == 1">
-    and a.status &gt; 1
-    </if>
     </select>
     <update id="updateByuids">
      update user_channel set

+ 3 - 3
src/main/java/com/goafanti/user/service/impl/UserChannelServiceImpl.java

@@ -188,9 +188,9 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
 					list.add(in);
 				}else {
 //					共享类型 0-私有 1-公共 2 签单
-					if(u.getShareType()==0)in.setStatus(2);
-					else if(u.getShareType()==1)in.setStatus(3);
-					else if(u.getShareType()==2)in.setStatus(4);
+					if(u.getShareType()==0)in.setStatus(3);
+					else if(u.getShareType()==1)in.setStatus(4);
+					else if(u.getShareType()==2)in.setStatus(5);
 					in.setUid(u.getId());
 					list2.add(in);
 				}