Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -69,22 +69,22 @@ public class AdminWebsitLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()
-                .and(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), v -> v.in(AdminWebsit::getCompanyWechatId,adminUser.getCompanyWechatIds()))
+                .and(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), v -> v.in(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds()))
                 .list();
         List<AdminWebsitTree> trees = new ArrayList<>();
-        for(AdminWebsit adminWebsit : list){
+        for (AdminWebsit adminWebsit : list) {
             AdminWebsitTree adminWebsitTree = new AdminWebsitTree();
-            BeanUtils.copyProperties(adminWebsit,adminWebsitTree);
+            BeanUtils.copyProperties(adminWebsit, adminWebsitTree);
             trees.add(adminWebsitTree);
         }
         AdminUserWebsitRela one = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
         List<AdminWebsitTree> parentList = trees.stream()
                 .filter(x -> (one == null && x.getParentId().equals("0")) || (one != null && x.getWebsitId().equals(one.getAdminWebsitId()))).collect(Collectors.toList());
-        if(CollectionUtils.isEmpty(parentList)){
+        if (CollectionUtils.isEmpty(parentList)) {
             parentList = trees.stream().filter(x -> x.getParentId().equals("0")).collect(Collectors.toList());
         }
-        for(AdminWebsitTree adminWebsit:parentList){
-            adminWebsit.setChildren(this.treeModule(trees,adminWebsit.getWebsitId()));
+        for (AdminWebsitTree adminWebsit : parentList) {
+            adminWebsit.setChildren(this.treeModule(trees, adminWebsit.getWebsitId()));
         }
         return parentList;
     }

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

@@ -64,9 +64,9 @@
         ${ex.selected}
         FROM websit_goods_price a LEFT JOIN websit_goods b ON a.goods_id = b.goods_id
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -82,9 +82,9 @@
         FROM websit_price_upd a
             <!-- LEFT JOIN websit_price_upd_item b ON a.sheet_id = b.sheet_id -->
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -99,9 +99,9 @@
         ${ex.selected}
         FROM websit_purchase a LEFT JOIN storage b ON a.storage_id = b.storage_id
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -117,9 +117,9 @@
         ${ex.selected}
         FROM websit_purchase_ret a LEFT JOIN storage b ON a.storage_id = b.storage_id
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -158,9 +158,9 @@
         join websit_sales_item b on a.sales_id = b.sales_id
         LEFT JOIN storage c on a.storage_id = c.storage_id
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -280,9 +280,9 @@
         ${ex.selected}
         FROM websit_sales_pay_order a
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -322,9 +322,9 @@
         IF((a.total_sales_amount - a.total_pay_amount) <![CDATA[ < ]]> 0, 0, (a.total_sales_amount - a.total_pay_amount)) AS totalNotPayAmount
         FROM engin_pay_manage a
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -342,9 +342,9 @@
         IF((SUM(a.total_sales_amount) - SUM(a.total_pay_amount)) <![CDATA[ < ]]> 0, 0, (SUM(a.total_sales_amount) - SUM(a.total_pay_amount))) AS totalNotPayAmount
         FROM engin_pay_manage a
         ${ex.query}
-        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>