Browse Source

fix:pc 天线记录调整

wrj 7 tháng trước cách đây
mục cha
commit
c3410ba73d

+ 0 - 5
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ComplaintController.java

@@ -1,16 +1,11 @@
 package com.ylx.web.controller.massage;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
 import com.ylx.common.annotation.Log;
 import com.ylx.common.core.domain.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.enums.BusinessType;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.ylx.massage.domain.BusinessDevelopment;
 import com.ylx.massage.domain.Complaint;
 import com.ylx.massage.enums.ComplaintEnum;
 import com.ylx.massage.enums.Enumproject;

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

@@ -3,6 +3,7 @@ package com.ylx.web.controller.massage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.TTxRecord;
@@ -26,7 +27,7 @@ import java.util.List;
 @RequestMapping("api/tx/record")
 @Api(tags = {"提现记录"})
 @Slf4j
-public class TTxRecordController {
+public class TTxRecordController extends BaseController {
     @Resource
     private TTxRecordService recordService;
 
@@ -97,6 +98,9 @@ public class TTxRecordController {
                 eq(StringUtils.isNotBlank(txRecord.getcName()), TTxRecord::getcName, txRecord.getcName()).
                 eq(StringUtils.isNotBlank(txRecord.getcOpenId()), TTxRecord::getcOpenId, txRecord.getcOpenId()).
                 orderByDesc(TTxRecord::getDtCreateTime);
+        if(null != this.getDeptId() && this.getDeptId() != 100){
+            tTxRecordLambdaQueryWrapper.eq(TTxRecord::getDeptId,this.getDeptId());
+        }
         return R.ok(recordService.page(page, tTxRecordLambdaQueryWrapper));
     }