需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -211,7 +211,8 @@ public interface CommonMapper {
      * @return
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType);
+    public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType
+    ,@Param("companyWechatId") String companyWechatId);
 
     /**
      * 考核项目配件列表

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -112,7 +112,8 @@ public class OrderBaseLogic {
         FieldUtils.supplyParam(zfireParamBean, OrderBaseVO.class, commonLogic.getAdminUser());
         zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
 
-        IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getType());
+        IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null);
 
         //服务单标识
         if (zfireParamBean.getPageSize() != -1 && page.getTotal() > 0) {

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

@@ -354,6 +354,9 @@
                 <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