From 32ba9cb4112823adea8440fa79c2ca490bd4c1ba Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 01 九月 2025 14:47:00 +0800
Subject: [PATCH] 添加ORGID
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 5 +++++
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 5 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 3 +++
smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java | 6 ++++++
smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 1 +
5 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
index 6237568..e61dfc3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -44,6 +44,8 @@
@GetMapping("/list")
public TableDataInfo selectSvyLibTemplatelist(SvyLibTemplate svyLibTemplate) {
startPage();
+ SysUser user = getLoginUser().getUser();
+ svyLibTemplate.setOrgid(user.getOrgid());
List<SvyLibTemplate> sviLibTemplate = svyLibTemplateService.getSviLibTemplate(svyLibTemplate);
return getDataTable(sviLibTemplate);
}
@@ -55,6 +57,9 @@
@PostMapping("/selectSvyLibTemplatelist")
public TableDataInfo selectSvyLibTemplatelist(@RequestBody SvyLibTemplateReq svyLibTemplateReq) {
PageUtils.startPageByPost(svyLibTemplateReq.getPageNum(), svyLibTemplateReq.getPageSize());
+ SysUser user = getLoginUser().getUser();
+ svyLibTemplateReq.setOrgid(user.getOrgid());
+
List<SvyLibTemplateVO> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);
if (CollectionUtils.isNotEmpty(list)) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index 5bfc05a..9be2b1e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
@@ -46,6 +47,8 @@
@GetMapping("/list")
public AjaxResult list(SysDept dept)
{
+ SysUser user = getLoginUser().getUser();
+ dept.setOrgid(user.getOrgid());
List<SysDept> depts = deptService.selectDeptList(dept);
return success(depts);
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java
index 8108e21..cae3177 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java
@@ -51,6 +51,12 @@
private String description;
/**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
* pageNum
*/
@ApiModelProperty("pageNum")
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
index 92f5d51..947dac7 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -55,15 +55,18 @@
svyLibTemplateReq.setCategoryid(svyLibTemplate.getCategoryid());
svyLibTemplateReq.setDescription(svyLibTemplate.getDescription());
svyLibTemplateReq.setSvyname(svyLibTemplate.getSvyname());
+ svyLibTemplateReq.setOrgid(svyLibTemplate.getOrgid());
List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
for (SvyLibTemplate svyLibTemplate1 : svyLibTemplates) {
SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
svyLibTemplateScript.setSvyid(svyLibTemplate1.getSvyid());
+ svyLibTemplateScript.setOrgid(svyLibTemplate1.getOrgid());
List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
for (SvyLibTemplateScript svyLibTemplateScript1 : svyLibTemplateScripts) {
if (svyLibTemplateScript1.getScriptType().equals("1") || svyLibTemplateScript1.getScriptType().equals("2")) {
SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption();
svyLibTemplateTargetoption.setScriptid(svyLibTemplateScript1.getId());
+ svyLibTemplateTargetoption.setOrgid(svyLibTemplateScript1.getOrgid());
List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
svyLibTemplateScript1.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
}
@@ -88,6 +91,7 @@
for (int i = 0; i < svyLibTemplateVOS.size(); i++) {
SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
svyLibTemplateScript.setSvyid(svyLibTemplateVOS.get(i).getSvyid());
+ svyLibTemplateScript.setOrgid(svyLibTemplateVOS.get(i).getOrgid());
List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
//鑾峰彇棰樼洰閫夐」
a:
@@ -99,6 +103,7 @@
} else {
SvyLibTemplateTargetoption svyLibTopicoption = new SvyLibTemplateTargetoption();
svyLibTopicoption.setScriptid(svyLibTemplateScripts.get(j).getId());
+ svyLibTopicoption.setOrgid(svyLibTemplateVOS.get(i).getOrgid());
List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTopicoption);
//灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
svyLibTemplateScripts.get(j).setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index c474be4..f7c88ce 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -128,6 +128,7 @@
<if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
<if test="svyid != null ">and a.svyid = #{svyid}</if>
<if test="longTemp != null ">and a.long_temp = #{longTemp}</if>
+ <if test="orgid != null ">and a.orgid = #{orgid}</if>
<if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
<if test="description != null and description != ''">and b.icd10name like concat('%', #{description}, '%')
</if>
--
Gitblit v1.9.3