Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/business/impl/AllocCanteenBusinessImpl.java

@@ -183,7 +183,6 @@ public class AllocCanteenBusinessImpl implements AllocCanteenBusiness {
    public AllocStallModifyModel getStallForModify(Long stallId) {
       AllocStall allocStall = (AllocStall)this.allocStallService.getOne(Wrappers.lambdaQuery(AllocStall.class)
               .eq(AllocStall::getStallId, stallId));
-      allocStall.setContactTel(this.aesEncryptUtil.aesEncrypt(allocStall.getContactTel()));
       AllocStallSaveDTO stallSaveDTO = new AllocStallSaveDTO();
       BeanUtils.copyProperties(allocStall, stallSaveDTO);
       if (ObjectUtil.isNotNull(stallSaveDTO.getCustId())) {
@@ -487,7 +486,6 @@ public class AllocCanteenBusinessImpl implements AllocCanteenBusiness {
       AllocStallModifyDTO stallModifyDTO = new AllocStallModifyDTO();
       BeanUtils.copyProperties(stallModel.getStallSaveDTO(), stallModifyDTO);
       stallModifyDTO.ifEnableHandler(stallModel);
-      stallModifyDTO.setContactTel(this.aesEncryptUtil.aesDecode(stallModifyDTO.getContactTel()));
       Long oldCanteenId = this.allocStallMapper.getCanteenId(stallId);
       if (LeConstants.COMMON_YES.equals(stallModifyDTO.getIfEnablePayCode())) {
          AllocStall tempStall = (AllocStall)this.allocStallService.getOne((Wrapper)Wrappers.lambdaQuery(AllocStall.class).eq(AllocStall::getStallId, stallId));

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java

@@ -169,19 +169,7 @@ public class AllocStallServiceImpl extends ServiceImpl<AllocStallMapper, AllocSt
          param.setAreaIdList(this.allocAreaService.getAllChildrenId(param.getAreaId()));
       }
 
-      page = this.baseMapper.pageStall(page, param);
+      return this.baseMapper.pageStall(page, param);
-      if (CollUtil.isEmpty(page.getRecords())) {
-         return page;
-      } else {
-         Iterator var3 = page.getRecords().iterator();
-
-         while(var3.hasNext()) {
-            AllocStallVO stallVO = (AllocStallVO)var3.next();
-            stallVO.setContactTel(this.aesEncryptUtil.aesEncrypt(stallVO.getContactTel()));
-         }
-
-         return page;
-      }
    }
 
    public void checkStallNameExist(String stallName, Long stallId) {

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountWalletConsumeMapper.xml

@@ -518,7 +518,7 @@
         <if test="param.sumType == 2">
             a.statistic_date,
         </if>
-        SUBSTRING_INDEX(SUBSTRING_INDEX(concat(g.ancestors, ','),',', #{param.orgLevel}  + 1), ',', -1) as a_org_id,
+        g.dept_id as a_org_id,
         SUM(IF(a.wallet_id = 1 ,consume_amount + repair_amount - refund_amount,0)) wallet_consume_amount,
         SUM(IF(a.wallet_id = 2 ,consume_amount + repair_amount - refund_amount,0)) subsidy_consume_amount,
         SUM(IF(a.wallet_id = 4 ,consume_amount + repair_amount - refund_amount,0)) luck_consume_amount,
@@ -528,16 +528,11 @@
         LEFT JOIN sys_user c ON a.cust_id = c.cust_id
         LEFT JOIN sys_dept g on g.dept_id = c.dept_id
         WHERE a.statistic_date BETWEEN #{param.startDate} AND #{param.endDate}
-        <if test="param.orgIdList != null and param.orgIdList.size() > 0">
+            and g.dept_id in
-            and (
+            <foreach collection="param.orgIdList" item="orgId" separator="," open="("
-            <foreach collection="param.orgIdList" item="orgId" separator=" or " open=""
+                     close=")">
-                     close="">
+                #{orgId}
-                g.ancestors like concat('', #{orgId}, ',%')
-                or g.ancestors like concat('%,', #{orgId}, ',%')
-                or g.ancestors like concat('%,', #{orgId}, '')
             </foreach>
-            )
-        </if>
         <if test="'2'.toString() == authPO.roleType.toString()">
             and EXISTS (
             SELECT null

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAccountConsumeSumOrgMapper.xml

@@ -18,7 +18,7 @@
         sys_dept g
         LEFT JOIN (
         SELECT
-        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(concat(g.ancestors, ','),',', #{param.orgLevel}  + 1), ',', -1) as SIGNED) as a_org_id,
+        g.dept_id as a_org_id,
         sum( consume_num ) AS consume_num,
         sum( consume_amount ) AS consume_amount,
         sum( consume_repair_num ) AS consume_repair_num,
@@ -31,16 +31,11 @@
         LEFT JOIN sys_dept g on g.dept_id = a.org_id
         <where>
             AND a.statistic_date BETWEEN #{param.startDate} AND #{param.endDate}
-            <if test="param.orgIdList != null and param.orgIdList.size() > 0">
+            and g.dept_id in
-                and (
+            <foreach collection="param.orgIdList" item="orgId" separator="," open="("
-                <foreach collection="param.orgIdList" item="orgId" separator=" or " open=""
+                     close=")">
-                         close="">
+                #{orgId}
-                    g.ancestors like concat('', #{orgId}, ',%')
-                    or g.ancestors like concat('%,', #{orgId}, ',%')
-                    or g.ancestors like concat('%,', #{orgId}, '')
             </foreach>
-                )
-            </if>
             <if test="'2'.toString() == authPO.roleType.toString()">
                 and EXISTS (
                 SELECT null
@@ -115,7 +110,7 @@
         ) d LEFT JOIN (
         SELECT
         statistic_date,
-        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(concat(g.ancestors, ','),',', #{param.orgLevel}  + 1), ',', -1) as SIGNED) as a_org_id,
+        g.dept_id as a_org_id,
         sum( consume_num ) AS consume_num,
         sum( consume_amount ) AS consume_amount,
         sum( consume_repair_num ) AS consume_repair_num,
@@ -128,16 +123,11 @@
         LEFT JOIN sys_dept g on g.dept_id = a.org_id
         <where>
             AND a.statistic_date BETWEEN #{param.startDate} AND #{param.endDate}
-            <if test="param.orgIdList != null and param.orgIdList.size() > 0">
+            and g.dept_id in
-                and (
+            <foreach collection="param.orgIdList" item="orgId" separator="," open="("
-                <foreach collection="param.orgIdList" item="orgId" separator=" or " open=""
+                     close=")">
-                         close="">
+                #{orgId}
-                    g.ancestors like concat('', #{orgId}, ',%')
-                    or g.ancestors like concat('%,', #{orgId}, ',%')
-                    or g.ancestors like concat('%,', #{orgId}, '')
             </foreach>
-                )
-            </if>
             <if test="'2'.toString() == authPO.roleType.toString()">
                 and EXISTS (
                 SELECT null
@@ -288,16 +278,11 @@
         LEFT JOIN sys_dept g on g.dept_id = a.org_id
         <where>
             AND a.statistic_date BETWEEN #{param.startDate} AND #{param.endDate}
-            <if test="param.orgIdList != null and param.orgIdList.size() > 0">
+            and g.dept_id in
-                and (
+            <foreach collection="param.orgIdList" item="orgId" separator="," open="("
-                <foreach collection="param.orgIdList" item="orgId" separator=" or " open=""
+                     close=")">
-                         close="">
+                #{orgId}
-                    g.ancestors like concat('', #{orgId}, ',%')
-                    or g.ancestors like concat('%,', #{orgId}, ',%')
-                    or g.ancestors like concat('%,', #{orgId}, '')
             </foreach>
-                )
-            </if>
             <if test="'2'.toString() == authPO.roleType.toString()">
                 and EXISTS (
                 SELECT null