From aacafc575236d3f606b6386f92698093cf1eacb9 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 10:12:13 +0800 Subject: [PATCH] =?UTF-8?q?58268=20country=20card-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=20=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0countryCardManage=E8=A7=92=E8=89=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 +- .../CountryCardManageReleaseEOController.java | 4 ++ .../ICountryCardManageReleaseEOService.java | 2 + ...CountryCardManageReleaseEOServiceImpl.java | 65 ++++++++++++++++--- .../enums/CollectManifestRoleIdEnum.java | 4 +- 5 files changed, 69 insertions(+), 11 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 481865b1d..0f6f4a6a2 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -973,4 +973,7 @@ ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`; -- 表字段 英文修改 2022-08-31 -UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; \ No newline at end of file +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; + +-- 增加角色，countryCard管理员。 2022-08-31 +INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 234a61609..1fb7ed795 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -56,6 +56,10 @@ public class CountryCardManageReleaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 0af88f36f..2e76c508d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -85,4 +85,6 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(String queryFlag,String cut); List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); + + boolean isCountryCardManage(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index 2dc1c22fc..0d280e121 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -16,8 +16,11 @@ import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMa import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryNationalFlagEOService; +import com.jero.modules.project.enums.CollectManifestRoleIdEnum; +import com.jero.modules.system.entity.SysUserRole; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.service.ISysUserRoleService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -52,6 +55,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl userRoleList = this.sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色 + if(CollectionUtils.isNotEmpty(userRoleList)){ + CollectManifestRoleIdEnum countruCardManage = CollectManifestRoleIdEnum.COUNTRU_CARD_MANAGE; + List userRoles = userRoleList.stream().filter(userRole -> { + boolean flag = false; + if(StringUtils.equals(userRole.getRoleId(),countruCardManage.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(userRoles)){ + result = true; + } + } + return result; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java index 46ac56ff5..a99a7decf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java @@ -14,7 +14,9 @@ import java.util.List; public enum CollectManifestRoleIdEnum { // STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1), ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2), - MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3); + MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3), + COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4), + ; String name; String enName;