diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/HomeController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/HomeController.java index 24d4fdd..6ce565b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/HomeController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/HomeController.java @@ -45,7 +45,7 @@ public class HomeController extends BaseController * 查询试验列表 */ @GetMapping("/noticeList") - @RequiresPermissions("business:study:list") + @RequiresPermissions("business:user:work") public TableDataInfo noticeService() { startPage(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/NoticeServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/NoticeServiceImpl.java index 5ec0ba4..7b77c4d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/NoticeServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/NoticeServiceImpl.java @@ -88,10 +88,11 @@ public class NoticeServiceImpl extends ServiceImpl impleme } } String title = "您参与的【"+study.getName()+"("+study.getSn()+")】【"+(study.getType().equals(StudyTypeEnum.sy.getValue())?studySubject.getDeptName():study.getDeptName())+"】有新试验方法,请进入试验的对应学科进行阅读"; + String url = study.getType().equals(StudyTypeEnum.sy.getValue())?("/study/enter/"+studyId+"?tab=syxx"):study.getType().equals(StudyTypeEnum.fsy.getValue())?("/nonTrial/enter/"+studyId+"?tab=syxx"):""; //试验学科内部的人+非试验部门内的人+麻精药不用判断(只需要判断有审核按钮) List userIdList = userMapper.selectStudyMethodUserIdExcludeCreate(studyId, study.getType().equals(StudyTypeEnum.sy.getValue())?studySubjectId:null,study.getType().equals(StudyTypeEnum.fsy.getValue())?study.getDeptId():null,createUserId); if(userIdList.size()>0){ - saveBatch(title,userIdList,null); + saveBatch(title,userIdList,url); } } }