From 6a4c1855c6e81b26f4ee7a4ed42a7837486ae020 Mon Sep 17 00:00:00 2001
From: jinfeng.wang <jinfeng.wang@mobvista.com>
Date: Mon, 18 Nov 2019 16:38:20 +0800
Subject: [PATCH] fix

---
 src/main/java/com/mobvista/apptag/mapper/TagDao.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mobvista/apptag/mapper/TagDao.java b/src/main/java/com/mobvista/apptag/mapper/TagDao.java
index 427f848..cf9cc61 100644
--- a/src/main/java/com/mobvista/apptag/mapper/TagDao.java
+++ b/src/main/java/com/mobvista/apptag/mapper/TagDao.java
@@ -41,7 +41,7 @@ public interface TagDao {
             String sql = "SELECT * FROM tag_list WHERE tag < " + tag;
 
             if (StringUtils.isNotBlank(userId)) {
-                sql += " AND (user_id NOT LIKE '%" + userId + "%' OR user_id IS NULL) AND flag = 0";
+                sql += " AND (((user_id NOT LIKE '%" + userId + "%' OR user_id IS NULL) AND flag = 0) OR ('"+userId+"' IN (SELECT user_id FROM user WHERE role = 1)))";
             }
             if (StringUtils.isNotBlank(search)) {
                 sql += " AND LOWER(package_name) LIKE '%" + search + "%'";
@@ -92,7 +92,7 @@ public interface TagDao {
         public String count(String search, int tag, String userId) {
             String sql = "SELECT COUNT(1) FROM tag_list WHERE tag < " + tag;
             if (StringUtils.isNotBlank(userId)) {
-                sql += " AND (user_id NOT LIKE '%" + userId + "%' OR user_id IS NULL) AND flag = 0";
+                sql += " AND (((user_id NOT LIKE '%" + userId + "%' OR user_id IS NULL) AND flag = 0) OR ('"+userId+"' IN (SELECT user_id FROM user WHERE role = 1)))";
             }
             if (StringUtils.isNotBlank(search)) {
                 sql += " AND LOWER(package_name) LIKE '%" + search + "%'";
--
libgit2 0.27.1