fix:技师数据统计 pc 数据权限

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

@@ -2,6 +2,7 @@ package com.ylx.web.controller.massage;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
@@ -201,6 +202,7 @@ public class TJsController extends BaseController {
     @ApiOperation("分页查询数据")
     public Page<TJs> selectSp(Page<TJs> page, TJs js) {
         LoginUser loginUser = this.getLoginUser();
+        log.info("loginUser：{}", JSONUtil.toJsonStr(loginUser));
         LambdaQueryWrapper<TJs> mhCompanyLambdaQueryWrapper = new LambdaQueryWrapper<>();
         mhCompanyLambdaQueryWrapper.eq(null != js.getnTong(), TJs::getnTong, js.getnTong()).
                 like(StringUtils.isNotBlank(js.getcName()), TJs::getcName, js.getcName()).
@@ -212,7 +214,7 @@ public class TJsController extends BaseController {
                 orderByDesc(TJs::getDtCreateTime);
         //部门数据
         if(loginUser.getDeptId() != 100){
-            mhCompanyLambdaQueryWrapper.eq(TJs::getDeptId,loginUser);
+            mhCompanyLambdaQueryWrapper.eq(TJs::getDeptId,loginUser.getDeptId().toString());
         }
         if (js.getPageType() == 1) {
             mhCompanyLambdaQueryWrapper.eq(TJs::getnTong, JsStatusEnum.JS_PASS.getCode());

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

@@ -53,6 +53,9 @@ public class TJsDayController extends BaseController {
                 ge(StringUtils.isNotBlank(tJsDay.getStartTime()) && StringUtils.isNotBlank(tJsDay.getEndTime()),TJsDay::getCountDate, tJsDay.getStartTime()).
             eq(StringUtils.isNotBlank(tJsDay.getName()), TJsDay::getName, tJsDay.getName()).
         orderByDesc(TJsDay::getCountDate);
+        if(null != this.getDeptId() && this.getDeptId() != 100){
+            tJsDayLambdaQueryWrapper.eq(TJsDay::getDeptId, this.getDeptId());
+        }
         return R.ok(this.tJsDayService.page(page, tJsDayLambdaQueryWrapper));
     }