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 a82e747..3799ce1 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 @@ -46,7 +46,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 查询企业基础信息列表 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class) @GetMapping("/list") public AjaxResult list(Page page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { @@ -66,7 +66,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 导出企业基础信息列表 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "导出企业基础信息列表") @Log(title = "企业基础信息", businessType = BusinessType.EXPORT) @PostMapping("/export") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java index d837120..f978d48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java @@ -64,8 +64,8 @@ public class SingleLoginServiceImpl implements SingleLoginService { roles[0] = 101L; } else if ("02".equals(userType)) { //在这里可以判断具体要给什么权限 要给dept部门id - roles[0] = 102L; - user.setDeptId(100L); + roles[0] = 103L; + user.setDeptId(null); user.setZwuser(userName); } user.setRoleIds(roles); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java index 2407657..6adc186 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java @@ -38,7 +38,7 @@ public class JDataScreenController extends BaseController { * * @return 所有数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "荣誉情况") @GetMapping("/honor") public AjaxResult getHonor(HonorResponse a) { @@ -50,7 +50,7 @@ public class JDataScreenController extends BaseController { * * @return 所有数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "项目追踪情况") @GetMapping("/projectTracking") public AjaxResult getProjectTracking() { @@ -62,7 +62,7 @@ public class JDataScreenController extends BaseController { * * @return 所有数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "服务业发展总览") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "年份1 季度2", required = true), @@ -79,7 +79,7 @@ public class JDataScreenController extends BaseController { * * @return 所有数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "行业纵深情况") @GetMapping("/getIndustryDepth") public AjaxResult getIndustryDepth() { @@ -91,7 +91,7 @@ public class JDataScreenController extends BaseController { * * @return 所有数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "所有分行业汇总") @GetMapping("/getAllIndustry") public AjaxResult getAllIndustry() { 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 806b7d5..06fc378 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 @@ -74,7 +74,7 @@ public class JProjectController extends BaseController { * @param jProject 查询实体 * @return 所有数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent,sightseer')") @ApiOperation(value = "分页查询项目", response = JProject.class) @GetMapping public AjaxResult selectPage(Page page, JProject jProject) { @@ -98,7 +98,7 @@ public class JProjectController extends BaseController { /** * 导出项目 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent,sightseer')") @ApiOperation(value = "导出项目") @PostMapping("/exportProject") public void exportProject(HttpServletResponse response, JProject jProject) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JServicesListController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JServicesListController.java index 60a4142..8ca1ef3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JServicesListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JServicesListController.java @@ -37,7 +37,7 @@ public class JServicesListController extends BaseController { * @param js 请求体 * @return 分页数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "分页查询服务业企业名单", response = JServicesList.class) @GetMapping public AjaxResult selectAll(Page page, JServicesListRequest js) { @@ -48,7 +48,7 @@ public class JServicesListController extends BaseController { /** * 首页服务业数据统计 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "首页服务业数据统计", response = JServicesListCountResponse.class) @GetMapping("/selectCount") public AjaxResult selectAllServicesCount() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java index 820d98c..1eaa50d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java @@ -73,7 +73,7 @@ public class JChiefWorkImpl implements JChiefWorkService { List memorandum = jChiefWorkMapper.memorandum(); memorandum.forEach(x->{ if(x.getContent().length()>10){ - x.setContent(x.getContent().substring(0, 10)+"***"); + x.setContent(x.getContent().substring(0, 10)+"..."); } }); return memorandum;