修改bug

puzhibing

2025-01-08 ddf3f19408fb311734218aaaa5edb49c5134b1eb

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java

@@ -14,6 +14,8 @@
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.service.TechnicianSubscribeService;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;

@@ -36,6 +38,12 @@
    private TechnicianSubscribeService technicianSubscribeService;
    @Resource
    private TokenService tokenService;
    @Resource
    private SysUserClient sysUserClient;






    @GetMapping("/shop/list")
@@ -44,8 +52,9 @@
                                @ApiParam("电话")String phone,
                                @ApiParam("姓名")String name,
                                @ApiParam("服务方式：1=上门服务，2=到店服务")Integer serviceMode, Integer pageCurr, Integer pageSize) {
        Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
        PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop1(Long.valueOf(objectId), status, phone, name, serviceMode, pageCurr, pageSize);
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop1(Long.valueOf(sysUser.getObjectId()), status, phone, name, serviceMode, pageCurr, pageSize);
        return R.ok(pageInfo);
    }