diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/TestController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/TestController.java index d456e61..d173fe9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/TestController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/TestController.java @@ -3,6 +3,7 @@ package com.hxhq.business.controller; import java.util.Arrays; import java.util.List; +import com.alibaba.fastjson2.JSONObject; import com.hxhq.common.core.web.controller.BaseController; import com.hxhq.common.core.web.domain.AjaxResult; import com.hxhq.common.core.web.page.TableDataInfo; @@ -62,4 +63,15 @@ public class TestController extends BaseController { return toAjax(testService.removeByIds(Arrays.asList(ids))); } + + + /** + * 查询落笔留痕 + */ + @GetMapping("/testLblh") + public AjaxResult testLblh(@RequestBody JSONObject json) + { + logger.info("落笔留痕请求:"+JSONObject.toJSONString(json)); + return AjaxResult.success(); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java index 50a0779..5476d2a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java @@ -80,9 +80,9 @@ public class StudyServiceImpl extends ServiceImpl implements if(form.getStatus()!=null && form.getStatus().intValue()>0){ queryWrapper.eq("s.status",form.getStatus()); } - //又新增权限的表示SD,SD能看所有试验,其他只能看自己进入的试验 - String sdPermit = "business:study:add"; - if (!AuthUtil.hasPermi(sdPermit)) + //TFM看所有试验,其他只能看自己进入的试验 + String tmfRole = "TFM"; + if (!AuthUtil.hasRole(tmfRole)) { queryWrapper.apply("(\n" + "s.id IN (\n" +