diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsPolicyConsultRecordController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsPolicyConsultRecordController.java index ca94065..75faedb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsPolicyConsultRecordController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsPolicyConsultRecordController.java @@ -2,12 +2,10 @@ package com.ruoyi.cms.controller.cms; import com.ruoyi.cms.domain.policy.*; import com.ruoyi.cms.service.policy.IPolicyConsultRecordService; -import com.ruoyi.cms.service.policy.impl.PolicyConsultRecordServiceImpl; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.SiteSecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -18,10 +16,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static jdk.nashorn.internal.runtime.regexp.joni.Config.log; - @RestController -@RequestMapping("/cms/policyConsultRecord") +@RequestMapping("/d/policyConsultRecord") @Api(tags = "CMS:政策咨询记录管理") public class CmsPolicyConsultRecordController extends BaseController { @@ -41,10 +37,10 @@ public class CmsPolicyConsultRecordController extends BaseController { if(!SecurityUtils.isLogin()){ return AjaxResult.error("用户未登录!"); } - if(SecurityUtils.getUserId() == null){ + if(SecurityUtils.getAppuserId() == null){ return AjaxResult.error("获取用户ID失败!"); } - policyConsultSubmitDTO.setUserId(SecurityUtils.getUserId()); + policyConsultSubmitDTO.setUserId(SecurityUtils.getAppuserId()); return toAjax(policyConsultRecordService.insert(policyConsultSubmitDTO)); } @@ -55,10 +51,10 @@ public class CmsPolicyConsultRecordController extends BaseController { @GetMapping("/my/list/{policyId}") public TableDataInfo getMyConsult(@ApiParam("政策ID") @PathVariable Long policyId){ startPage(); - if(SecurityUtils.getUserId() == null){ + if(SecurityUtils.getAppuserId() == null){ throw new RuntimeException("用户ID不能为空"); } - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getAppuserId(); List list = policyConsultRecordService.getUserOwnConsultList(policyId,userId); return getDataTable(list); } @@ -73,10 +69,10 @@ public class CmsPolicyConsultRecordController extends BaseController { return AjaxResult.error("用户未登录!"); } - if(SecurityUtils.getUserId() == null){ + if(SecurityUtils.getAppuserId() == null){ return AjaxResult.error("获取用户ID失败!"); } - dto.setUserId(SecurityUtils.getUserId()); + dto.setUserId(SecurityUtils.getAppuserId()); return toAjax(policyConsultRecordService.submitSatisfaction(dto)); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyConsultRecordServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyConsultRecordServiceImpl.java index d51ee9c..efe6622 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyConsultRecordServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyConsultRecordServiceImpl.java @@ -21,7 +21,6 @@ import java.util.List; import static com.ruoyi.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS; -@Slf4j @Service public class PolicyConsultRecordServiceImpl extends ServiceImpl implements IPolicyConsultRecordService {