‘linchangsheng’ 4 months ago
parent
commit
a703508a95

+ 0 - 3
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -79,9 +79,6 @@ public class OrderBaseEsLogic {
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
             List<QueryBuilder> should = queryBuilder.should();
-            if (adminUser.getType().equals(1)) {
-                should.add(QueryBuilders.termsQuery("company_wechat_id", adminUser.getCompanyWechatId()));
-            }
             should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
             should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
         }

+ 1 - 3
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -370,9 +370,7 @@
                 <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
-            <if test="companyWechatId != null and companyWechatId != ''">
-                or a.company_wechat_id  =  #{companyWechatId}
-            </if>
+
             )
         </if>
         order by a.create_time desc,id desc