diff --git a/build/classes/com/hangxin/web/SatisfacTion.class b/build/classes/com/hangxin/web/SatisfacTion.class
index 9a1ad48..eaf69dd 100644
Binary files a/build/classes/com/hangxin/web/SatisfacTion.class and b/build/classes/com/hangxin/web/SatisfacTion.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class
index 2fb7d98..eaf69dd 100644
Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 14bef66..ef1a407 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Sun Nov 12 23:09:04 CST 2023
+#Mon Nov 13 23:34:01 CST 2023
 deploystamp=1612237236000
diff --git a/src/com/hangxin/web/SatisfacTion.java b/src/com/hangxin/web/SatisfacTion.java
index 739b694..0d1a6e9 100644
--- a/src/com/hangxin/web/SatisfacTion.java
+++ b/src/com/hangxin/web/SatisfacTion.java
@@ -1310,9 +1310,27 @@ public List<Map> zql(Params params) {
     if (query == 3) {
         queryString = " and 1=0";
     }
-    /*if (query == 2|| query==4) {
-        queryString = " and org_name='"+orgname+"'";
-    }*/
+    if (query == 2|| query==4) {
+     String userid=SessionHelper.getCurrentUserId();
+            List<Map>  orglist=DbHelper.getDbService().queryMapList("select crmcompanyid,org_short_name,  parent_org_id pid from  RUSH_CRMCOMP_TO_USER_RELATION  a\n" +
+                    "left join  COMPANY_ORGANIZE   b  on a.crmcompanyid=b.org_id where RUSH_USERID=?",userid);
+            if(orglist.size()>0){
+                StringBuffer sb = new StringBuffer();
+                sb.append(" and org_name in (");
+                for(int i=0;i<orglist.size();i++){
+                    sb.append("'" + orglist.get(i).get("org_short_name") + "'");
+                    if (i < orglist.size() - 1) {
+                        sb.append(",");
+                    }
+                }
+                sb.append(")");
+                queryString=sb.toString();
+            }
+            else{
+                queryString=" and org_name='"+orgname+"'";
+            }
+
+    }
     if (searchbegindate != null) {
         dateString = " and  to_char(create_time,'yyyy-mm-dd')>='"+searchbegindate+"'"
                 + " and to_char(create_time,'yyyy-mm-dd')<='" +searchenddate+"'";