fix：[试验管理]权限

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java

@@ -11,6 +11,7 @@ import com.hxhq.business.form.gyzj.*;
 import com.hxhq.business.service.IGyzjJcgjService;
 import com.hxhq.business.service.IGyzjTzService;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,7 @@ public class GyzjController extends BaseController
     /**
      * 列表
      */
-    @RequiresPermissions({"business:studyGyzj:list","business:nonTrialGyzj:list","business:drugGyzj:list"})
+    @RequiresPermissions(value = {"business:studyGyzj:list","business:nonTrialGyzj:list","business:drugGyzj:list"}, logical= Logical.OR)
     @GetMapping("/studyList")
     public TableDataInfo studyList(SearchForm form)
     {
@@ -202,7 +203,7 @@ public class GyzjController extends BaseController
      * 批量处置药剂
      */
     @PostMapping("/plczyj")
-    @RequiresPermissions({"business:resource:gyzj:czyj","business:studyGyzj:czyj","business:nonTrialGyzj:czyj","business:drugGyzj:czyj"})
+    @RequiresPermissions(value={"business:resource:gyzj:czyj","business:studyGyzj:czyj","business:nonTrialGyzj:czyj","business:drugGyzj:czyj"}, logical= Logical.OR)
     public AjaxResult plczyj(@RequestBody PlczyjForm form)
     {
         gyzjService.plczyj(form);
@@ -284,7 +285,7 @@ public class GyzjController extends BaseController
      * 编辑
      */
     @PostMapping("bj")
-    @RequiresPermissions({"business:resource:gyzj:bj","business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"})
+    @RequiresPermissions(value={"business:resource:gyzj:bj","business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"}, logical= Logical.OR)
     public AjaxResult bj(@RequestBody BjForm form)
     {
         gyzjService.bj(form);
@@ -309,7 +310,7 @@ public class GyzjController extends BaseController
      * 修改库存
      */
     @PostMapping("xgkc")
-    @RequiresPermissions({"business:resource:gyzj:xgkc","business:studyGyzj:xgkc","business:nonTrialGyzj:xgkc","business:drugGyzj:xgkc"})
+    @RequiresPermissions(value={"business:resource:gyzj:xgkc","business:studyGyzj:xgkc","business:nonTrialGyzj:xgkc","business:drugGyzj:xgkc"}, logical= Logical.OR)
     public AjaxResult xgkc(@RequestBody XgkcForm form)
     {
         gyzjService.xgkc(form);
@@ -332,7 +333,7 @@ public class GyzjController extends BaseController
      * 申请归还
      */
     @PostMapping("sqgh")
-    @RequiresPermissions({"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
+    @RequiresPermissions(value={"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"}, logical= Logical.OR)
     public AjaxResult sqgh(@RequestBody GhForm form)
     {
         gyzjService.sqgh(form);
@@ -355,7 +356,7 @@ public class GyzjController extends BaseController
      * 申请入库
      */
     @PostMapping("sqrk")
-    @RequiresPermissions({"business:studyGyzj:rk","business:nonTrialGyzj:rk","business:drugGyzj:rk"})
+    @RequiresPermissions(value={"business:studyGyzj:rk","business:nonTrialGyzj:rk","business:drugGyzj:rk"}, logical= Logical.OR)
     public AjaxResult sqrk(@RequestBody RkForm form)
     {
         gyzjService.sqrk(form);
@@ -388,7 +389,7 @@ public class GyzjController extends BaseController
      * 存储
      */
     @PostMapping("cc")
-    @RequiresPermissions({"business:studyGyzj:cc","business:nonTrialGyzj:cc","business:drugGyzj:cc"})
+    @RequiresPermissions(value={"business:studyGyzj:cc","business:nonTrialGyzj:cc","business:drugGyzj:cc"}, logical= Logical.OR)
     public AjaxResult cc(@RequestBody CcForm form)
     {
         gyzjService.cc(form);
@@ -400,7 +401,7 @@ public class GyzjController extends BaseController
      * 取出
      */
     @PostMapping("qc")
-    @RequiresPermissions({"business:studyGyzj:qc","business:nonTrialGyzj:qc","business:drugGyzj:qc"})
+    @RequiresPermissions(value={"business:studyGyzj:qc","business:nonTrialGyzj:qc","business:drugGyzj:qc"}, logical= Logical.OR)
     public AjaxResult qc(@RequestBody CcForm form)
     {
         gyzjService.qc(form);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java

@@ -9,6 +9,7 @@ import com.hxhq.business.form.mjy.*;
 import com.hxhq.business.service.IMjyJcgjService;
 import com.hxhq.business.service.IMjyTzService;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +50,7 @@ public class MjyController extends BaseController {
     /**
      * 列表
      */
-    @RequiresPermissions({"business:studyMjy:list", "business:nonTrialMjy:list", "business:drugMjy:list"})
+    @RequiresPermissions(value={"business:studyMjy:list", "business:nonTrialMjy:list", "business:drugMjy:list"}, logical= Logical.OR)
     @GetMapping("/studyList")
     public TableDataInfo studyList(SearchForm form) {
         startPage();
@@ -194,7 +195,7 @@ public class MjyController extends BaseController {
      * 批量处置药剂
      */
     @PostMapping("/plczyj")
-    @RequiresPermissions({"business:resource:mjy:czyj", "business:studyMjy:czyj", "business:nonTrialMjy:czyj", "business:drugMjy:czyj"})
+    @RequiresPermissions(value={"business:resource:mjy:czyj", "business:studyMjy:czyj", "business:nonTrialMjy:czyj", "business:drugMjy:czyj"}, logical= Logical.OR)
     public AjaxResult plczyj(@RequestBody PlczyjForm form) {
         form.setClrId(SecurityUtils.getUserId());
         mjyService.plczyj(form);
@@ -273,7 +274,7 @@ public class MjyController extends BaseController {
      * 编辑
      */
     @PostMapping("bj")
-    @RequiresPermissions({"business:resource:mjy:bj", "business:studyMjy:bj", "business:nonTrialMjy:bj", "business:drugMjy:bj"})
+    @RequiresPermissions(value={"business:resource:mjy:bj", "business:studyMjy:bj", "business:nonTrialMjy:bj", "business:drugMjy:bj"}, logical= Logical.OR)
     public AjaxResult bj(@RequestBody BjForm form) {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.bj(form);
@@ -297,7 +298,7 @@ public class MjyController extends BaseController {
      * 修改库存
      */
     @PostMapping("xgkc")
-    @RequiresPermissions({"business:resource:mjy:xgkc", "business:studyMjy:xgkc", "business:nonTrialMjy:xgkc", "business:drugMjy:xgkc"})
+    @RequiresPermissions(value={"business:resource:mjy:xgkc", "business:studyMjy:xgkc", "business:nonTrialMjy:xgkc", "business:drugMjy:xgkc"}, logical= Logical.OR)
     public AjaxResult xgkc(@RequestBody XgkcForm form) {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.xgkc(form);
@@ -352,7 +353,7 @@ public class MjyController extends BaseController {
      * 存储
      */
     @PostMapping("cc")
-    @RequiresPermissions({"business:studyMjy:cc","business:nonTrialMjy:cc","business:drugMjy:cc"})
+    @RequiresPermissions(value={"business:studyMjy:cc","business:nonTrialMjy:cc","business:drugMjy:cc"}, logical= Logical.OR)
     public AjaxResult cc(@RequestBody CcForm form)
     {
         mjyService.cc(form);
@@ -363,7 +364,7 @@ public class MjyController extends BaseController {
      * 取出
      */
     @PostMapping("qc")
-    @RequiresPermissions({"business:studyMjy:qc","business:nonTrialMjy:qc","business:drugMjy:qc"})
+    @RequiresPermissions(value={"business:studyMjy:qc","business:nonTrialMjy:qc","business:drugMjy:qc"}, logical= Logical.OR)
     public AjaxResult qc(@RequestBody CcForm form)
     {
         mjyService.qc(form);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java

@@ -10,6 +10,7 @@ import com.hxhq.business.form.study.StudyFormApplySearchForm;
 import com.hxhq.business.form.study.StudyFormUpdateForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -147,7 +148,7 @@ public class StudyFormApplyController extends BaseController {
      * 保存
      */
     @PostMapping("/bc")
-    @RequiresPermissions({"business:drugFormApply:bj","business:drugFormApply:xz"})
+    @RequiresPermissions(value={"business:drugFormApply:bj","business:drugFormApply:xz"}, logical= Logical.OR)
     public AjaxResult bc(@RequestBody StudyFormApply studyFormApply) {
         return AjaxResult.success(studyFormApplyService.bc(studyFormApply));
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java

@@ -10,6 +10,7 @@ import com.hxhq.business.form.study.StudyFormFillSearchForm;
 import com.hxhq.business.form.study.StudyFormUpdateForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,7 +52,7 @@ public class StudyFormFillController extends BaseController {
      * 列表
      */
     @GetMapping("/list")
-    @RequiresPermissions({"business:studyFormFill:list","business:nonTrialFormFill:list","business:drugFormFill:list"})
+    @RequiresPermissions(value = {"business:studyFormFill:list", "business:nonTrialFormFill:list", "business:drugFormFill:list"}, logical = Logical.OR)
     public TableDataInfo list(StudyFormFillSearchForm form) {
         startPage();
         List<StudyFormFillListDto> list = studyFormFillService.queryList(form);
@@ -62,7 +63,7 @@ public class StudyFormFillController extends BaseController {
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    @RequiresPermissions({"business:studyFormFill:bj","business:nonTrialFormFill:bj","business:drugFormFill:bj"})
+    @RequiresPermissions(value = {"business:studyFormFill:bj", "business:nonTrialFormFill:bj", "business:drugFormFill:bj"}, logical = Logical.OR)
     public TableDataInfo jcgjList(StudyFormFillJcgj form) {
         startPage();
         List<StudyFormFillJcgj> list = studyFormFillJcgjService.queryList(form);
@@ -73,7 +74,7 @@ public class StudyFormFillController extends BaseController {
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
-    @RequiresPermissions({"business:studyFormFill:xq","business:nonTrialFormFill:xq","business:drugFormFill:xq"})
+    @RequiresPermissions(value = {"business:studyFormFill:xq", "business:nonTrialFormFill:xq", "business:drugFormFill:xq"}, logical = Logical.OR)
     public TableDataInfo qmxxList(StudyFormFillQmxx form) {
         startPage();
         List<StudyFormFillQmxx> list = studyFormFillQmxxService.queryList(form);
@@ -84,7 +85,7 @@ public class StudyFormFillController extends BaseController {
      * 详细
      */
     @GetMapping(value = "/info")
-    @RequiresPermissions({"business:studyFormFill:xq","business:nonTrialFormFill:xq","business:drugFormFill:xq"})
+    @RequiresPermissions(value = {"business:studyFormFill:xq", "business:nonTrialFormFill:xq", "business:drugFormFill:xq"}, logical = Logical.OR)
     public AjaxResult getInfo(Long id) {
         return AjaxResult.success(studyFormFillService.queryInfo(id));
     }
@@ -93,22 +94,22 @@ public class StudyFormFillController extends BaseController {
     /**
      * 导出
      */
-    @RequiresPermissions({"business:studyFormFill:xq","business:nonTrialFormFill:xq","business:drugFormFill:xq"})
+    @RequiresPermissions(value = {"business:studyFormFill:xq", "business:nonTrialFormFill:xq", "business:drugFormFill:xq"}, logical = Logical.OR)
     @GetMapping(value = "/exportDetail")
     public AjaxResult exportDetail(StudyFormFillJcgj form) {
         List<StudyFormFillJcgj> studyFormFillJcgjList = studyFormFillJcgjService.queryList(form);
         StudyFormFillQmxx studyFormFillQmxx = new StudyFormFillQmxx();
         studyFormFillQmxx.setFormId(form.getFormId());
         List<StudyFormFillQmxx> studyFormFillQmxxList = studyFormFillQmxxService.queryList(studyFormFillQmxx);
-        StudyFormFill studyFormFill=studyFormFillService.queryInfo(form.getFormId());
-        return AjaxResult.success(localFilePrefix + PdfExportUtil.export(studyFormFill.getTemplateExportClass(), studyFormFill.getTemplateExportMethod(),studyFormFill,studyFormFillQmxxList,studyFormFillJcgjList,form.getLang(),form.getJcgjlx(),localFilePath));
+        StudyFormFill studyFormFill = studyFormFillService.queryInfo(form.getFormId());
+        return AjaxResult.success(localFilePrefix + PdfExportUtil.export(studyFormFill.getTemplateExportClass(), studyFormFill.getTemplateExportMethod(), studyFormFill, studyFormFillQmxxList, studyFormFillJcgjList, form.getLang(), form.getJcgjlx(), localFilePath));
     }
 
     /**
      * 加签
      */
     @PostMapping("/jq")
-    @RequiresPermissions({"business:studyFormFill:jq","business:nonTrialFormFill:jq","business:drugFormFill:jq"})
+    @RequiresPermissions(value = {"business:studyFormFill:jq", "business:nonTrialFormFill:jq", "business:drugFormFill:jq"}, logical = Logical.OR)
     public AjaxResult jq(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.jq(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -118,7 +119,7 @@ public class StudyFormFillController extends BaseController {
      * 废止
      */
     @PostMapping("/fz")
-    @RequiresPermissions({"business:studyFormFill:fz","business:nonTrialFormFill:fz","business:drugFormFill:fz"})
+    @RequiresPermissions(value = {"business:studyFormFill:fz", "business:nonTrialFormFill:fz", "business:drugFormFill:fz"}, logical = Logical.OR)
     public AjaxResult fz(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fz(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -129,7 +130,7 @@ public class StudyFormFillController extends BaseController {
      * 确认废止
      */
     @PostMapping("/qrfz")
-    @RequiresPermissions({"business:studyFormFill:qrfz","business:nonTrialFormFill:qrfz","business:drugFormFill:qrfz"})
+    @RequiresPermissions(value = {"business:studyFormFill:qrfz", "business:nonTrialFormFill:qrfz", "business:drugFormFill:qrfz"}, logical = Logical.OR)
     public AjaxResult qrfz(@RequestBody StudyFormFillShfzForm form) {
         studyFormFillService.qrfz(form);
         return AjaxResult.success("操作成功");
@@ -140,7 +141,7 @@ public class StudyFormFillController extends BaseController {
      * 更换归属人
      */
     @PostMapping("/ghgsr")
-    @RequiresPermissions({"business:studyFormFill:ghgsr","business:nonTrialFormFill:ghgsr","business:drugFormFill:ghgsr"})
+    @RequiresPermissions(value = {"business:studyFormFill:ghgsr", "business:nonTrialFormFill:ghgsr", "business:drugFormFill:ghgsr"}, logical = Logical.OR)
     public AjaxResult ghgsr(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.ghgsr(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -150,9 +151,9 @@ public class StudyFormFillController extends BaseController {
      * 保存
      */
     @PostMapping("/bc")
-    @RequiresPermissions({"business:studyFormFill:bj","business:studyFormFill:xz",
-            "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz",
-            "business:drugFormFill:bj","business:drugFormFill:xz"})
+    @RequiresPermissions(value = {"business:studyFormFill:bj", "business:studyFormFill:xz",
+            "business:nonTrialFormFill:bj", "business:nonTrialFormFill:xz",
+            "business:drugFormFill:bj", "business:drugFormFill:xz"}, logical = Logical.OR)
     public AjaxResult bc(@RequestBody StudyFormFill studyFormFill) {
         return AjaxResult.success(studyFormFillService.bc(studyFormFill));
     }
@@ -162,7 +163,7 @@ public class StudyFormFillController extends BaseController {
      * 提交
      */
     @PostMapping("/tj")
-    @RequiresPermissions({"business:studyFormFill:bj","business:nonTrialFormFill:bj","business:drugFormFill:bj"})
+    @RequiresPermissions(value = {"business:studyFormFill:bj", "business:nonTrialFormFill:bj", "business:drugFormFill:bj"}, logical = Logical.OR)
     public AjaxResult tj(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.tj(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -173,7 +174,7 @@ public class StudyFormFillController extends BaseController {
      * 观察
      */
     @PostMapping("/gc")
-    @RequiresPermissions({"business:studyFormFill:gc","business:nonTrialFormFill:gc","business:drugFormFill:gc"})
+    @RequiresPermissions(value = {"business:studyFormFill:gc", "business:nonTrialFormFill:gc", "business:drugFormFill:gc"}, logical = Logical.OR)
     public AjaxResult gc(@RequestBody StudyFormFillGcForm form) {
         studyFormFillService.gc(form);
         return AjaxResult.success("操作成功");
@@ -184,7 +185,7 @@ public class StudyFormFillController extends BaseController {
      * 复核通过
      */
     @PostMapping("/fhtg")
-    @RequiresPermissions({"business:studyFormFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
+    @RequiresPermissions(value = {"business:studyFormFill:fh", "business:nonTrialFormFill:fh", "business:drugFormFill:fh"}, logical = Logical.OR)
     public AjaxResult fhtg(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fhtg(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -195,7 +196,7 @@ public class StudyFormFillController extends BaseController {
      * 复核拒绝
      */
     @PostMapping("/fhjj")
-    @RequiresPermissions({"business:studyFormFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
+    @RequiresPermissions(value = {"business:studyFormFill:fh", "business:nonTrialFormFill:fh", "business:drugFormFill:fh"}, logical = Logical.OR)
     public AjaxResult fhjj(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fhjj(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -205,7 +206,7 @@ public class StudyFormFillController extends BaseController {
      * 通过
      */
     @PostMapping("/tg")
-    @RequiresPermissions({"business:studyFormFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
+    @RequiresPermissions(value = {"business:studyFormFill:fh", "business:nonTrialFormFill:fh", "business:drugFormFill:fh"}, logical = Logical.OR)
     public AjaxResult tg(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.tg(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -215,7 +216,7 @@ public class StudyFormFillController extends BaseController {
      * 审阅
      */
     @PostMapping("/sy")
-    @RequiresPermissions({"business:studyFormFill:sy","business:nonTrialFormFill:sy","business:drugFormFill:sy"})
+    @RequiresPermissions(value = {"business:studyFormFill:sy", "business:nonTrialFormFill:sy", "business:drugFormFill:sy"}, logical = Logical.OR)
     public AjaxResult sy(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.sy(studyFormFill);
         return AjaxResult.success("操作成功");

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java

@@ -9,6 +9,7 @@ import com.hxhq.business.form.study.StudyFormUpdateForm;
 import com.hxhq.business.service.IStudyFormPlanJcgjService;
 import com.hxhq.business.service.IStudyFormPlanQmxxService;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -116,7 +117,7 @@ public class StudyFormPlanController extends BaseController
      * 保存
      */
     @PostMapping("/bc")
-    @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:xz"})
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:nonTrialFormPre:xz"}, logical= Logical.OR)
     public AjaxResult bc(@RequestBody StudyFormPlan studyFormPlan) {
         return AjaxResult.success(studyFormPlanService.bc(studyFormPlan));
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java

@@ -15,6 +15,7 @@ import com.hxhq.business.service.IStudyFormPreJcgjService;
 import com.hxhq.business.service.IStudyFormPreQmxxService;
 import com.hxhq.business.service.IStudyService;
 import com.hxhq.common.core.exception.ServiceException;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,9 +50,9 @@ public class StudyFormPreController extends BaseController
      * 查询试验列表
      */
     @GetMapping("/studyList")
-    @RequiresPermissions({"business:studyFormPre:bj","business:studyFormPre:xz",
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:studyFormPre:xz",
             "business:nonTrialFormPre:bj","business:nonTrialFormPre:xz",
-            "business:drugFormPre:bj","business:drugFormPre:xz"})
+            "business:drugFormPre:bj","business:drugFormPre:xz"}, logical= Logical.OR)
     public AjaxResult studyList() {
         QueryWrapper<Study> queryWrapper = Wrappers.query();
         queryWrapper.in("status", StudyStatusEnum.syz.getValue(),StudyStatusEnum.ysd.getValue());
@@ -63,9 +64,9 @@ public class StudyFormPreController extends BaseController
      * 查询试验预填表单列表
      */
     @GetMapping("/studyFormPreList")
-    @RequiresPermissions({"business:studyFormPre:bj","business:studyFormPre:xz",
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:studyFormPre:xz",
             "business:nonTrialFormPre:bj","business:nonTrialFormPre:xz",
-            "business:drugFormPre:bj","business:drugFormPre:xz"})
+            "business:drugFormPre:bj","business:drugFormPre:xz"}, logical= Logical.OR)
     public AjaxResult studyFormPreList(StudyFormPreSearchForm form) {
         if (form.getStudyId() == null || form.getStudyId().longValue() < 0) {
             throw new ServiceException("试验id不能为空");
@@ -77,7 +78,7 @@ public class StudyFormPreController extends BaseController
      * 列表
      */
     @GetMapping("/list")
-    @RequiresPermissions({"business:studyFormPre:list","business:nonTrialFormPre:list","business:drugFormPre:list"})
+    @RequiresPermissions(value={"business:studyFormPre:list","business:nonTrialFormPre:list","business:drugFormPre:list"}, logical= Logical.OR)
     public TableDataInfo list(StudyFormPreSearchForm form)
     {
         startPage();
@@ -89,7 +90,7 @@ public class StudyFormPreController extends BaseController
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    @RequiresPermissions({"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"})
+    @RequiresPermissions(value={"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"}, logical= Logical.OR)
     public TableDataInfo jcgjList(StudyFormPreJcgj form)
     {
         startPage();
@@ -101,7 +102,7 @@ public class StudyFormPreController extends BaseController
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
-    @RequiresPermissions({"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"})
+    @RequiresPermissions(value={"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"}, logical= Logical.OR)
     public TableDataInfo qmxxList(StudyFormPreQmxx form)
     {
         startPage();
@@ -113,7 +114,7 @@ public class StudyFormPreController extends BaseController
      * 详细
      */
     @GetMapping(value = "/info")
-    @RequiresPermissions({"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"})
+    @RequiresPermissions(value={"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"}, logical= Logical.OR)
     public AjaxResult getInfo(Long id)
     {
         return AjaxResult.success(studyFormPreService.queryInfo(id));
@@ -123,9 +124,9 @@ public class StudyFormPreController extends BaseController
      * 保存
      */
     @PostMapping("/bc")
-    @RequiresPermissions({"business:studyFormPre:bj","business:studyFormPre:xz",
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:studyFormPre:xz",
             "business:nonTrialFormPre:bj","business:nonTrialFormPre:xz",
-            "business:drugFormPre:bj","business:drugFormPre:xz"})
+            "business:drugFormPre:bj","business:drugFormPre:xz"}, logical= Logical.OR)
     public AjaxResult bc(@RequestBody StudyFormPre studyFormPre)
     {
         return AjaxResult.success(studyFormPreService.bc(studyFormPre));
@@ -135,7 +136,7 @@ public class StudyFormPreController extends BaseController
      * 提交
      */
     @PostMapping("/tj")
-    @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:bj","business:drugFormPre:bj"})
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:nonTrialFormPre:bj","business:drugFormPre:bj"}, logical= Logical.OR)
     public AjaxResult tj(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.tj(studyFormPre);
@@ -147,7 +148,7 @@ public class StudyFormPreController extends BaseController
      * 填报
      */
     @PostMapping("/tb")
-    @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:bj","business:drugFormPre:bj"})
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:nonTrialFormPre:bj","business:drugFormPre:bj"}, logical= Logical.OR)
     public AjaxResult tb(@RequestBody StudyFormPre studyFormPre)
     {
         return AjaxResult.success(studyFormPreService.tb(studyFormPre));
@@ -157,7 +158,7 @@ public class StudyFormPreController extends BaseController
      * 通过
      */
     @PostMapping("/tg")
-    @RequiresPermissions({"business:studyFormPre:sh","business:nonTrialFormPre:sh","business:drugFormPre:sh"})
+    @RequiresPermissions(value={"business:studyFormPre:sh","business:nonTrialFormPre:sh","business:drugFormPre:sh"}, logical= Logical.OR)
     public AjaxResult tg(@RequestBody StudyFormPreAuditForm form)
     {
         studyFormPreService.tg(form);
@@ -168,7 +169,7 @@ public class StudyFormPreController extends BaseController
      * 拒绝
      */
     @PostMapping("/jj")
-    @RequiresPermissions({"business:studyFormPre:sh","business:nonTrialFormPre:sh","business:drugFormPre:sh"})
+    @RequiresPermissions(value={"business:studyFormPre:sh","business:nonTrialFormPre:sh","business:drugFormPre:sh"}, logical= Logical.OR)
     public AjaxResult jj(@RequestBody StudyFormPreAuditForm form)
     {
         studyFormPreService.jj(form);