Merge branch 'develop'

mall-server-api/src/main/java/com/gree/mall/manager/controller/common/WechatController.java

@@ -1,6 +1,5 @@
 package com.gree.mall.manager.controller.common;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.gree.mall.manager.annotation.ApiNotAuth;
 import com.gree.mall.manager.bean.PayDetail;
@@ -201,9 +200,9 @@ public class WechatController {
             @RequestParam String code,
             @RequestParam String pubAppId
     ) throws WxErrorException, IOException {
-        log.info("公众号授权:{}, 开始时间:{}" , code, DateUtil.formatDateTime(DateUtil.date()));
+//        log.info("公众号授权:{}, 开始时间:{}" , code, DateUtil.formatDateTime(DateUtil.date()));
         String openId = commonLogic.getPubOpenId(code, pubAppId);
-        log.info("公众号授权:{}, 结束时间:{}" , code, DateUtil.formatDateTime(DateUtil.date()));
+//        log.info("公众号授权:{}, 结束时间:{}" , code, DateUtil.formatDateTime(DateUtil.date()));
         return ResponseHelper.success(openId);
     }
 

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

@@ -2,6 +2,7 @@ package com.gree.mall.manager.logic.admin;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -679,6 +680,9 @@ public class AdminUserLogic {
                 websitUserIds.addAll(deptRelas.stream()
                         .map(AdminUserDeptRela::getAdminUserId)
                         .collect(Collectors.toSet()));
+                log.info("查询的部门: {}, 递归部门: {}, 查询到的账号id: {}", JSONUtil.toJsonStr(adminDeptList), JSONUtil.toJsonStr(deptIds), JSONUtil.toJsonStr(deptRelas.stream()
+                        .map(AdminUserDeptRela::getAdminUserId)
+                        .collect(Collectors.toSet())));
             }
         }