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 7b77c4d..ce952e7 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,7 +88,7 @@ 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"):""; + String url = study.getType().equals(StudyTypeEnum.sy.getValue())?("/study/enter/"+studyId+"/syff"):study.getType().equals(StudyTypeEnum.fsy.getValue())?("/nonTrial/enter/"+studyId+"/syff"):""; //试验学科内部的人+非试验部门内的人+麻精药不用判断(只需要判断有审核按钮) 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){ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java index e8ac70e..1b26018 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java @@ -10,6 +10,7 @@ import com.hxhq.business.dto.study.StudyFormPreListDto; import com.hxhq.business.enums.SnTypeEnum; import com.hxhq.business.enums.study.StudyFormPreBdztEnum; import com.hxhq.business.enums.study.StudyFormPreFzrshztEnum; +import com.hxhq.business.enums.study.StudyTypeEnum; import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.study.StudyFormPreAuditForm; @@ -59,6 +60,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl