diff --git a/src/main/java/com/xdap/self_development/controller/DataEntryController.java b/src/main/java/com/xdap/self_development/controller/DataEntryController.java index 61ef9f6..0ecd3b8 100644 --- a/src/main/java/com/xdap/self_development/controller/DataEntryController.java +++ b/src/main/java/com/xdap/self_development/controller/DataEntryController.java @@ -1,6 +1,7 @@ package com.xdap.self_development.controller; import com.definesys.mpaas.common.http.Response; +import com.xdap.api.moudle.user.vo.LoginUserVo; import com.xdap.runtime.service.RuntimeAppContextService; import com.xdap.runtime.service.RuntimeDatasourceService; import com.xdap.runtime.service.RuntimeUserService; @@ -42,11 +43,13 @@ public class DataEntryController { String currentTenantId = runtimeAppContextService.getCurrentTenantId(); String currentToken = runtimeAppContextService.getCurrentToken(); String currentUserId = runtimeAppContextService.getCurrentUserId(); + LoginUserVo loginUserVo = runtimeUserService.queryLoginUserVo(currentUserId, currentTenantId, currentAppId); map.put("currentAppId", currentAppId); map.put("currentTenantId", currentTenantId); map.put("currentToken", currentToken); map.put("currentUserId", currentUserId); + map.put("loginUserVo", loginUserVo.toString()); return Response.ok().data(map); } diff --git a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java index ee43d5c..98e1bb9 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java @@ -10,8 +10,10 @@ import com.xdap.self_development.pojo.Parameter; import com.xdap.self_development.pojo.RevisionRecord; import com.xdap.self_development.pojo.Template; import com.xdap.self_development.pojo.TemplateAndParameter; +import com.xdap.self_development.pojo.view.MenuParamView; import com.xdap.self_development.pojo.view.ParametersView; import com.xdap.self_development.pojo.view.TemplateInfoView; +import com.xdap.self_development.service.ModelRoleService; import com.xdap.self_development.service.ParameterService; import com.xdap.self_development.utils.FormulaValidator; import com.xdap.self_development.utils.ParameterOperation; @@ -31,6 +33,8 @@ import java.util.stream.Collectors; public class ParameterServiceImpl implements ParameterService { @Resource private BusinessDatabase bd; + @Resource + private ModelRoleService modelRoleService; @Override public PageQueryResult getParameterByCondition(ParameterPageForm form) { @@ -42,6 +46,9 @@ public class ParameterServiceImpl implements ParameterService { throw new CommonException("模板未找到"); } + //todo 获取指定子系统下的用户的权限,权限应该为:参数的 parameterNumber + List menuParamViews = modelRoleService.selectPersByUser("zjh"); + return bd.getBusinessDatabase() .viewQueryMode(true) .view("selectParametersByTemplateId") diff --git a/src/main/resources/sql.sql b/src/main/resources/sql.sql index 4f13412..d717ff4 100644 --- a/src/main/resources/sql.sql +++ b/src/main/resources/sql.sql @@ -99,17 +99,17 @@ CREATE TABLE yfsjglpt_model_dep_user_role( ) COMMENT '部门或用户关联角色表'; ---角色权限关联表 +-- 角色权限关联表 DROP TABLE IF EXISTS yc_datasource_0.yfsjglpt_model_role_permission; CREATE TABLE yc_datasource_0.yfsjglpt_model_role_permission( - `id` VARCHAR(64) NOT NULL COMMENT 'ID', - `role_id` VARCHAR(64) COMMENT '角色ID', - `per_id` VARCHAR(64) COMMENT '权限路径ID', - `is_enable` INT DEFAULT 1 COMMENT '是否启用;0:未启用;1:启用', - `created_by` VARCHAR(64) COMMENT '创建人', - `creation_date` DATETIME COMMENT '创建时间', - `last_updated_by` VARCHAR(64) COMMENT '最后更新人', - `last_update_date` DATETIME COMMENT '最后更新时间', - PRIMARY KEY (`id`) + `id` VARCHAR(64) NOT NULL COMMENT 'ID', + `role_id` VARCHAR(64) COMMENT '角色ID', + `per_id` VARCHAR(64) COMMENT '权限路径ID', + `is_enable` INT DEFAULT 1 COMMENT '是否启用;0:未启用;1:启用', + `created_by` VARCHAR(64) COMMENT '创建人', + `creation_date` DATETIME COMMENT '创建时间', + `last_updated_by` VARCHAR(64) COMMENT '最后更新人', + `last_update_date` DATETIME COMMENT '最后更新时间', + PRIMARY KEY (`id`) ) COMMENT '角色权限关联表';