jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改：注释权限

Browse Source
This commit is contained in:
zjh 2025-12-11 10:55:44 +08:00
parent eab25baba2
commit 087612b6b6
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/xdap/self_development/common/UserPermissionGetter.java
View File

@ -23,8 +23,8 @@ public class UserPermissionGetter {
private RuntimeAppContextService runtimeAppContextService; private RuntimeAppContextService runtimeAppContextService;
public String getCurrentUserId() { public String getCurrentUserId() {
// return runtimeAppContextService.getCurrentUserId(); return runtimeAppContextService.getCurrentUserId();
return "zjh"; // return "zjh";
} }
// 获取子系统下的参数权限 // 获取子系统下的参数权限

2
src/main/java/com/xdap/self_development/pojo/Template.java
View File

@ -11,7 +11,7 @@ import java.sql.Timestamp;
@SQLQuery(value = { @SQLQuery(value = {
@SQL(view = "getMaxOrder", @SQL(view = "getMaxOrder",
sql = "select *, MAX(order_num) AS maxOrder from yfsjglpt_model_template GROUP BY template_name"), sql = "SELECT * FROM ( SELECT *, MAX(order_num) OVER (PARTITION BY template_name ) AS maxOrder , ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY order_num DESC) AS rn FROM yfsjglpt_model_template ) tmp WHERE rn = 1"),
// 查找每个模板的最新版本并且优先级按照已发布、审核中、草稿状态转变（只有这三种状态） // 查找每个模板的最新版本并且优先级按照已发布、审核中、草稿状态转变（只有这三种状态）
@SQL(view = "getLatestTemplate", @SQL(view = "getLatestTemplate",
sql = "SELECT ranked.id, ranked.template_name, ranked.version, ranked.status, ranked.created_time , ranked.published_time, xu.username AS 'createBy' FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM yfsjglpt_model_template t WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) ranked LEFT JOIN xdap_users xu ON xu.id = ranked.create_by WHERE rn = 1 ORDER BY CASE status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC" sql = "SELECT ranked.id, ranked.template_name, ranked.version, ranked.status, ranked.created_time , ranked.published_time, xu.username AS 'createBy' FROM ( SELECT t.*, ROW_NUMBER() OVER (PARTITION BY template_name ORDER BY CASE WHEN status = 'COMPLETE' THEN 1 WHEN status = 'APPROVING' THEN 2 ELSE 3 END, version DESC) AS rn FROM yfsjglpt_model_template t WHERE status IN ('COMPLETE', 'DRAFT', 'APPROVING') ) ranked LEFT JOIN xdap_users xu ON xu.id = ranked.create_by WHERE rn = 1 ORDER BY CASE status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC"

22
src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
View File

@ -51,21 +51,21 @@ public class ParameterServiceImpl implements ParameterService {
} }
//todo 假定子系统名和模板名一致 //todo 假定子系统名和模板名一致
Set<String> objects = new HashSet<>(); // Set<String> objects = new HashSet<>();
objects.addAll(permissionGetter.getParamPermissions(template.getTemplateName())); // objects.addAll(permissionGetter.getParamPermissions(template.getTemplateName()));
objects.addAll(bd.getBusinessDatabase() // objects.addAll(bd.getBusinessDatabase()
.viewQueryMode(true) // .viewQueryMode(true)
.view("selectParametersByTIdAndCreateBy") // .view("selectParametersByTIdAndCreateBy")
.setVar("templateId", template.getId()) // .setVar("templateId", template.getId())
.setVar("createdBy", permissionGetter.getCurrentUserId()) // .setVar("createdBy", permissionGetter.getCurrentUserId())
.doQuery(Parameter.class).stream().map(Parameter::getId).collect(Collectors.toList())); // .doQuery(Parameter.class).stream().map(Parameter::getId).collect(Collectors.toList()));
List<String> parameterIds = new ArrayList<>(objects); // List<String> parameterIds = new ArrayList<>(objects);
return bd.getBusinessDatabase() return bd.getBusinessDatabase()
.viewQueryMode(true) .viewQueryMode(true)
.view("selectParametersByTemplateId") .view("selectParametersByTId")
.setVar("templateId", template.getId()) .setVar("templateId", template.getId())
.setVar("parameterIds", parameterIds) // .setVar("parameterIds", parameterIds)
.like("parameter_name", form.getParameterName()) .like("parameter_name", form.getParameterName())
.like("parts_name", form.getPartsName()) .like("parts_name", form.getPartsName())
.like("parameter_type", form.getParameterType()) .like("parameter_type", form.getParameterType())