FengChaoYu 7 ماه پیش
والد
کامیت
fd30e36ab5

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/bean/material/report/WorkerPurchaseCategoryBean.java

@@ -16,7 +16,7 @@ public class WorkerPurchaseCategoryBean {
     @ApiModelProperty(value = "网点编号")
     private String websitId;
     @ApiModelProperty(value = "网点名称")
-    private String websiteName;
+    private String websitName;
     @ApiModelProperty(value = "师傅编号")
     private String workerId;
     @ApiModelProperty(value = "师傅名称")

+ 2 - 2
mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -1327,10 +1327,10 @@
             t1.purchase_id = t2.purchase_id
             AND t1.company_wechat_id = #{companyWechatId}
             <if test="websitId != null and websitId != ''">
-                AND a.websit_id = #{websitId}
+                AND t1.websit_id = #{websitId}
             </if>
             <if test="websitId == null and websits != null and websits.size > 0">
-                AND a.websit_id IN
+                AND t1.websit_id IN
                 <foreach item="item" index="index" collection="websits" open="(" separator=","
                          close=")">
                     #{item}