管理端商户选择新增排除过滤错误修复

src/dsb/com/cnd3b/restcontroller/enterprise/tagents/tagents.java

@@ -43,15 +43,6 @@ public class tagents extends Controller {
                 where.append("or t2.fphonenumber like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("notin") && !"".equals(whereObject.getString("notin"))) {
-                JSONObject notinObject = whereObject.getJSONObject("notin");
-                String tablename = notinObject.getString("tablename");
-                if (tablename.equalsIgnoreCase("tactivity_agentmsg")) {
-                    long tactivityid = notinObject.getLong("tactivityid");
-                    where.append(" and not exists( select * from tactivity_agentmsg where siteid='" + siteid + "' " +
-                            "and tactivityid='" + tactivityid + "' and tagentsid=t1.tagentsid ) ");
-                }
-            }
         }
         SQLFactory singleagentSql = new SQLFactory(this, "个人商户列表查询", pageSize, pageNumber, "t1.tagentsid");
         singleagentSql.addParameter("siteid", siteid);
@@ -86,6 +77,15 @@ public class tagents extends Controller {
                 where.append("or t1.fbrand like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("notin") && !"".equals(whereObject.getString("notin"))) {
+                JSONObject notinObject = whereObject.getJSONObject("notin");
+                String tablename = notinObject.getString("tablename");
+                if (tablename.equalsIgnoreCase("tactivity_agentmsg")) {
+                    long tactivityid = notinObject.getLong("tactivityid");
+                    where.append(" and not exists( select * from tactivity_agentmsg where siteid='" + siteid + "' " +
+                            "and tactivityid='" + tactivityid + "' and tagentsid=t1.tagentsid ) ");
+                }
+            }
         }
         SQLFactory agentsql = new SQLFactory(this, "认证商户列表查询", pageSize, pageNumber, "t1.tagentsid");
         agentsql.addParameter("siteid", siteid);