zhaoxian 3 tahun lalu
induk
melakukan
fb55a5b64b

+ 0 - 3
ruixuan-live/src/main/java/com/ruixuan/live/service/impl/KuaishouLiveUserAccountServiceImpl.java

@@ -75,9 +75,6 @@ public class KuaishouLiveUserAccountServiceImpl implements IKuaishouLiveUserAcco
     @Override
     @Override
     public List<KuaishouLiveUserAccount> selectKuaishouLiveUserAccountList(KuaishouLiveUserAccount kuaishouLiveUserAccount) {
     public List<KuaishouLiveUserAccount> selectKuaishouLiveUserAccountList(KuaishouLiveUserAccount kuaishouLiveUserAccount) {
         List<KuaishouLiveUserAccount> list = new ArrayList<>();
         List<KuaishouLiveUserAccount> list = new ArrayList<>();
-        if (Check.isNull(kuaishouLiveUserAccount.getAccountType())) {
-            kuaishouLiveUserAccount.setAccountType("cljn");
-        }
         String roleCode = roleService.selectRoleByUserId(kuaishouLiveUserAccount.getUserId());
         String roleCode = roleService.selectRoleByUserId(kuaishouLiveUserAccount.getUserId());
         if ("admin".equals(roleCode)) {
         if ("admin".equals(roleCode)) {
             PageUtils.startPage();
             PageUtils.startPage();

+ 2 - 2
ruixuan-live/src/main/resources/mapper/live/KuaishouLiveUserAccountMapper.xml

@@ -71,7 +71,7 @@
         GROUP BY ks_id,account_name, collaborator) tt
         GROUP BY ks_id,account_name, collaborator) tt
         GROUP BY ksId ,accountName
         GROUP BY ksId ,accountName
         ) t2 ON t2.accountName = t1.account_name AND t2.ksId = t1.ks_id
         ) t2 ON t2.accountName = t1.account_name AND t2.ksId = t1.ks_id
-        <where>
+        where account_type in ('cljn','cljnydd' ,'cp')
             <if test="ksId != null ">and ks_id = #{ksId}</if>
             <if test="ksId != null ">and ks_id = #{ksId}</if>
             <if test="ksName != null  and ksName != ''">and ks_name like concat('%', #{ksName}, '%')</if>
             <if test="ksName != null  and ksName != ''">and ks_name like concat('%', #{ksName}, '%')</if>
             <if test="accountId != null ">and account_id = #{accountId}</if>
             <if test="accountId != null ">and account_id = #{accountId}</if>
@@ -90,7 +90,7 @@
             </if>
             </if>
             <if test="designerLeader != null  and designerLeader != ''">and designer_leader = #{designerLeader}</if>
             <if test="designerLeader != null  and designerLeader != ''">and designer_leader = #{designerLeader}</if>
             <if test="createrId != null  and createrId != ''">and creater_id = #{createrId}</if>
             <if test="createrId != null  and createrId != ''">and creater_id = #{createrId}</if>
-        </where>
+
         ORDER BY create_time desc
         ORDER BY create_time desc
     </select>
     </select>