diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java
index 3c30279..e3d1d0c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java
@@ -160,6 +160,7 @@ public class BmsDeclarationRecordsController extends BaseController {
/**
* 查询在线申报记录列表-政务
*/
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@GetMapping("/listRecords")
public TableDataInfo listRecords(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) {
startPage();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java
index 62bcad2..64d6199 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java
@@ -78,7 +78,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
* 导入企业基础信息列表
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "导入企业基础信息列表")
@Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT)
@PostMapping(value = "/importEnterprise", consumes = "multipart/form-data")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java
index 1c06a9e..a171940 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java
@@ -56,7 +56,7 @@ public class BmsTemplateInfoController extends BaseController {
/**
* 新增项目时查询所有模板信息
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@GetMapping("/allList")
@ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfo.class)
public AjaxResult allList(BmsTemplateInfo bmsTemplateInfo) {
@@ -101,7 +101,7 @@ public class BmsTemplateInfoController extends BaseController {
/**
* 新增申报模板信息
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@Log(title = "新增申报模板信息", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增申报模板信息")
@PostMapping
@@ -112,7 +112,7 @@ public class BmsTemplateInfoController extends BaseController {
/**
* 修改申报模板信息
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@Log(title = "修改申报模板信息", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改申报模板信息")
@PostMapping("/edit")
@@ -128,7 +128,7 @@ public class BmsTemplateInfoController extends BaseController {
/**
* 删除申报模板信息
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@Log(title = "申报模板信息", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除申报模板信息")
@PostMapping("/{ids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java
index 0dd6bc8..73c13e4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java
@@ -68,7 +68,7 @@ public class BmsTemplateRecordController extends BaseController {
* @param bmsTemplateRecordUpdateDto
* @return
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "补录")
@PostMapping("/supplementation")
public AjaxResult supplementation(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
@@ -125,7 +125,7 @@ public class BmsTemplateRecordController extends BaseController {
* 删除在线模板
*/
@ApiOperation(value = "删除在线模板")
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@Log(title = "在线模板", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java
index 7bcc456..91cc6b6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java
@@ -96,7 +96,7 @@ public class JEnterpriseContactController extends BaseController {
* @param jEnterpriseContact 实体对象
* @return 新增结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,ent')")
@ApiOperation(value = "新增数据")
@PostMapping
public AjaxResult insert(@RequestBody JEnterpriseContact jEnterpriseContact) {
@@ -112,7 +112,7 @@ public class JEnterpriseContactController extends BaseController {
* @param jEnterpriseContact 实体对象
* @return 修改结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,ent')")
@ApiOperation(value = "修改数据")
@PostMapping("/edit")
public AjaxResult update(@RequestBody JEnterpriseContact jEnterpriseContact) {
@@ -128,7 +128,7 @@ public class JEnterpriseContactController extends BaseController {
* @param ids 主键结合
* @return 删除结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,ent')")
@ApiOperation(value = "删除数据")
@PostMapping("/{ids}")
public AjaxResult delete(@PathVariable Long[] ids) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JPolicyFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JPolicyFileController.java
index 17f91de..48e5afe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JPolicyFileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JPolicyFileController.java
@@ -70,7 +70,7 @@ public class JPolicyFileController extends BaseController {
*/
@ApiOperation(value = "新增数据")
@PostMapping
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
public AjaxResult insert(@RequestBody JPolicyFile jPolicyFile) {
return success(jPolicyFileService.save(jPolicyFile));
}
@@ -81,7 +81,7 @@ public class JPolicyFileController extends BaseController {
* @param jPolicyFile 实体对象
* @return 修改结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "修改数据")
@PostMapping("/edit")
public AjaxResult update(@RequestBody JPolicyFile jPolicyFile) {
@@ -94,7 +94,7 @@ public class JPolicyFileController extends BaseController {
* @param id 主键结合
* @return 删除结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "删除数据")
@PostMapping("/{id}")
public AjaxResult delete(@PathVariable Long id) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
index c340b2b..e93789a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
@@ -168,7 +168,7 @@ public class JProjectController extends BaseController {
* @param id 主键
* @return 删除结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "删除项目")
@PostMapping("/{id}")
public AjaxResult delete(@PathVariable Long id) {
@@ -178,7 +178,7 @@ public class JProjectController extends BaseController {
/**
* 导入已有的excel项目数据
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "导入已有的excel项目数据")
@PostMapping(value = "/export", consumes = "multipart/form-data")
public AjaxResult export(@RequestPart("file") MultipartFile file) throws Exception {
@@ -197,7 +197,7 @@ public class JProjectController extends BaseController {
/**
* 导入下载的excel模板和参数项目数据
*/
-// @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "导入下载的excel模板和参数项目数据")
@PostMapping(value = "/importTemplateProject", consumes = "multipart/form-data")
@ApiImplicitParams({
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java
index db3c2ae..9df7399 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java
@@ -163,7 +163,7 @@ public class JSmartRemindersController extends BaseController {
* @param id 主键
* @return 单条数据
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "通过主键查询单条智能提醒规则数据", response = JSmartReminders.class)
@GetMapping("{id}")
public AjaxResult selectOneSmart(@PathVariable Serializable id) {
@@ -176,7 +176,7 @@ public class JSmartRemindersController extends BaseController {
* @param jSmartRemindersDq 实体对象
* @return 新增结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "新增定期提醒数据(政务端和企业端)")
@PostMapping
public AjaxResult insertDs(@RequestBody @Valid JSmartRemindersDq jSmartRemindersDq) throws SchedulerException, TaskException {
@@ -195,7 +195,7 @@ public class JSmartRemindersController extends BaseController {
* @param dq 实体对象
* @return 修改结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "修改定期提醒数据")
@PostMapping("/updateDq")
public AjaxResult updateDq(@RequestBody @Valid JSmartRemindersDq dq) throws SchedulerException, TaskException {
@@ -212,7 +212,7 @@ public class JSmartRemindersController extends BaseController {
* @param ndq 实体对象
* @return 修改结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "修改不定期提醒数据")
@PostMapping("/updateNdq")
public AjaxResult updateNdq(@RequestBody @Valid JSmartRemindersNDq ndq) {
@@ -230,7 +230,7 @@ public class JSmartRemindersController extends BaseController {
* @param id 主键结合
* @return 删除结果
*/
- @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')")
@ApiOperation(value = "删除数据")
@PostMapping("/{id}")
public AjaxResult delete(@PathVariable Long id) throws SchedulerException {
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml
index 5b3547c..3173929 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml
@@ -52,7 +52,7 @@
and a.road = #{req.road}
and b.level = #{req.level}
and b.responsibility_unit = #{req.responsibilityUnit}
- and b.template_name like concat('%',
+ and b.template_name like concat('%',
#{req.templateName}, '%')