PC端 提现记录查询BUG修改 收入明细导出接口问题修改

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TFinancialIncomeController.java

@@ -76,6 +76,9 @@ public class TFinancialIncomeController extends BaseController {
     @ApiOperation("导出")
     @PostMapping(value = "pc/export")
     public void export(HttpServletResponse response, Page<TOrder> page, TOrder param) {
+        LoginUser loginUser = this.getLoginUser();
+        log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
+        param.setDeptId(loginUser.getDeptId().toString());
         Page<TOrder> all = orderService.getAll(page, param);
         ExcelUtil<TOrder> util = new ExcelUtil<>(TOrder.class);
         util.exportExcel(response, all.getRecords(), "订单");

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TTxRecordController.java

@@ -170,7 +170,7 @@ public class TTxRecordController extends BaseController {
     public R<List<Map<String, Object>>> wxSelect(TTxRecord txRecord) {
         log.info("商家获取提现记录,查询开始：{}", LocalDateTime.now());
         LambdaQueryWrapper<TTxRecord> tTxRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        tTxRecordLambdaQueryWrapper.eq(null != txRecord.getcOpenId(), TTxRecord::getcOpenId, txRecord.getcOpenId()).
+        tTxRecordLambdaQueryWrapper.eq(com.ylx.common.utils.StringUtils.isNotBlank(txRecord.getcOpenId()), TTxRecord::getcOpenId, txRecord.getcOpenId()).
                 eq(txRecord.getnStatus()!=null,TTxRecord::getnStatus,txRecord.getnStatus()).
                 orderByDesc(TTxRecord::getDtCreateTime);
         List<TTxRecord> listRecord = recordService.list(tTxRecordLambdaQueryWrapper);