From 83187f51aef5692354bd88ed166a748e32cc78fb Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 22 八月 2022 10:58:46 +0800
Subject: [PATCH] 规章制度去掉发布版本验证
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java | 20 ++++++++++----------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsManualController.java | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsTemplateController.java | 4 ++--
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java | 20 ++++++++++----------
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsManualController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsManualController.java
index 59f344f..39ed802 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsManualController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsManualController.java
@@ -47,7 +47,7 @@
* 鏌ヨ鎵嬪唽绠＄悊鍒楄〃
*/
@ApiOperation("鏌ヨ鎵嬪唽绠＄悊鍒楄〃")
- @PreAuthorize("@ss.hasPermi('oa:manual:list')")
+ //@PreAuthorize("@ss.hasPermi('oa:manual:list')")
@GetMapping("/list")
public TableDataInfo<BsManualVo> list(@Validated(QueryGroup.class) BsManualBo bo) {
return iBsManualService.queryPageList(bo);
@@ -57,7 +57,7 @@
* 瀵煎嚭鎵嬪唽绠＄悊鍒楄〃
*/
@ApiOperation("瀵煎嚭鎵嬪唽绠＄悊鍒楄〃")
- @PreAuthorize("@ss.hasPermi('oa:manual:export')")
+ //@PreAuthorize("@ss.hasPermi('oa:manual:export')")
@Log(title = "鎵嬪唽绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public void export(@Validated BsManualBo bo, HttpServletResponse response) {
@@ -69,7 +69,7 @@
* 鑾峰彇鎵嬪唽绠＄悊璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎵嬪唽绠＄悊璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('oa:manual:query')")
+ //@PreAuthorize("@ss.hasPermi('oa:manual:query')")
@GetMapping("/{id}")
public AjaxResult<BsManualVo> getInfo(@ApiParam("涓婚敭")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsTemplateController.java
index 03ef275..dcff44f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsTemplateController.java
@@ -47,7 +47,7 @@
* 鏌ヨ妯℃澘绠＄悊鍒楄〃
*/
@ApiOperation("鏌ヨ妯℃澘绠＄悊鍒楄〃")
- @PreAuthorize("@ss.hasPermi('oa:template:list')")
+ //@PreAuthorize("@ss.hasPermi('oa:template:list')")
@GetMapping("/list")
public TableDataInfo<BsTemplateVo> list(@Validated(QueryGroup.class) BsTemplateBo bo) {
return iBsTemplateService.queryPageList(bo);
@@ -69,7 +69,7 @@
* 鑾峰彇妯℃澘绠＄悊璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇妯℃澘绠＄悊璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('oa:template:query')")
+ //@PreAuthorize("@ss.hasPermi('oa:template:query')")
@GetMapping("/{id}")
public AjaxResult<BsTemplateVo> getInfo(@ApiParam("涓婚敭")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java
index 238f2ab..3274c27 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java
@@ -58,10 +58,10 @@
if (list.size() > 0) {
throw new ServiceException("瑙勭珷鍒跺害閲嶅", HttpStatus.HTTP_PARTIAL);
}
- List<BsRules> vList = baseMapper.selectList(new LambdaQueryWrapper<BsRules>().eq(BsRules::getVersionCode, bo.getVersionCode()));
- if (vList.size() > 0) {
- throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
- }
+// List<BsRules> vList = baseMapper.selectList(new LambdaQueryWrapper<BsRules>().eq(BsRules::getVersionCode, bo.getVersionCode()));
+// if (vList.size() > 0) {
+// throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
+// }
BsRules add = BeanUtil.toBean(bo, BsRules.class);
validEntityBeforeSave(add);
boolean flag = save(add);
@@ -79,12 +79,12 @@
if (list.size() > 0) {
throw new ServiceException("瑙勭珷鍒跺害閲嶅", HttpStatus.HTTP_PARTIAL);
}
- List<BsRules> vList = baseMapper.selectList(new LambdaQueryWrapper<BsRules>()
- .eq(BsRules::getVersionCode, bo.getVersionCode())
- .ne(BsRules::getId, bo.getId()));
- if (vList.size() > 0) {
- throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
- }
+// List<BsRules> vList = baseMapper.selectList(new LambdaQueryWrapper<BsRules>()
+// .eq(BsRules::getVersionCode, bo.getVersionCode())
+// .ne(BsRules::getId, bo.getId()));
+// if (vList.size() > 0) {
+// throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
+// }
BsRules update = BeanUtil.toBean(bo, BsRules.class);
validEntityBeforeSave(update);
return updateById(update);
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java
index 96476f8..d56e1a3 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java
@@ -59,10 +59,10 @@
if (list.size() > 0) {
throw new ServiceException("妯℃澘閲嶅", HttpStatus.HTTP_PARTIAL);
}
- List<BsTemplate> vList = baseMapper.selectList(new LambdaQueryWrapper<BsTemplate>().eq(BsTemplate::getVersionCode, bo.getVersionCode()));
- if (vList.size() > 0) {
- throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
- }
+// List<BsTemplate> vList = baseMapper.selectList(new LambdaQueryWrapper<BsTemplate>().eq(BsTemplate::getVersionCode, bo.getVersionCode()));
+// if (vList.size() > 0) {
+// throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
+// }
BsTemplate add = BeanUtil.toBean(bo, BsTemplate.class);
validEntityBeforeSave(add);
boolean flag = save(add);
@@ -80,12 +80,12 @@
if (list.size() > 0) {
throw new ServiceException("妯℃澘閲嶅", HttpStatus.HTTP_PARTIAL);
}
- List<BsTemplate> vList = baseMapper.selectList(new LambdaQueryWrapper<BsTemplate>()
- .eq(BsTemplate::getVersionCode, bo.getVersionCode())
- .ne(BsTemplate::getId, bo.getId()));
- if (vList.size() > 0) {
- throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
- }
+// List<BsTemplate> vList = baseMapper.selectList(new LambdaQueryWrapper<BsTemplate>()
+// .eq(BsTemplate::getVersionCode, bo.getVersionCode())
+// .ne(BsTemplate::getId, bo.getId()));
+// if (vList.size() > 0) {
+// throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
+// }
BsTemplate update = BeanUtil.toBean(bo, BsTemplate.class);
validEntityBeforeSave(update);
return updateById(update);
--
Gitblit v1.9.1