From 32cc827d1c6fd975d5430e242c07f4a2baed792d Mon Sep 17 00:00:00 2001 From: yangyang Date: Tue, 31 Mar 2026 15:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Abug1228=20=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A1=A8=E6=A0=BC=E9=9D=9E=E7=B3=BB=E7=BB=9F=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=93=8D=E4=BD=9C=E5=9D=87=E4=B8=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=87=AA=E5=AE=9A=E4=B9=89=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimulationSystemConfigController.java | 5 +-- .../sdm/system/model/bo/FormConfigure.java | 3 ++ .../model/req/system/FormConfigureReq.java | 4 +++ .../ISimulationSystemConfigService.java | 2 +- .../SimulationSystemConfigServiceImpl.java | 35 ++++++++++--------- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java b/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java index 32662654..ee9d648d 100644 --- a/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java +++ b/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java @@ -147,9 +147,10 @@ public class SimulationSystemConfigController implements ISysConfigFeignClient { @GetMapping(value = "/getFormConfigure") @ResponseBody - SdmResponse getFormConfigure(@RequestParam("formName") String formName) + SdmResponse getFormConfigure(@RequestParam("formName") String formName,@RequestParam("sourceType ") String sourceType ) + // fromType 默认 不传就是个人，传sys 就是系统过来的 { - return service.queryFormConfigure(formName); + return service.queryFormConfigure(formName,sourceType); } @PostMapping(value = "/addFormConfigure") diff --git a/system/src/main/java/com/sdm/system/model/bo/FormConfigure.java b/system/src/main/java/com/sdm/system/model/bo/FormConfigure.java index 225e4187..f0df9049 100644 --- a/system/src/main/java/com/sdm/system/model/bo/FormConfigure.java +++ b/system/src/main/java/com/sdm/system/model/bo/FormConfigure.java @@ -22,4 +22,7 @@ public class FormConfigure{ public String userId; + // 来源：系统页面传 sys,默认其他页面不传 + public String sourceType = ""; + } diff --git a/system/src/main/java/com/sdm/system/model/req/system/FormConfigureReq.java b/system/src/main/java/com/sdm/system/model/req/system/FormConfigureReq.java index c4a0f501..39277a54 100644 --- a/system/src/main/java/com/sdm/system/model/req/system/FormConfigureReq.java +++ b/system/src/main/java/com/sdm/system/model/req/system/FormConfigureReq.java @@ -15,4 +15,8 @@ public class FormConfigureReq extends BaseReq { public Long creator; public String createTime; + + // 来源：系统页面传 sys,默认其他页面不传 + public String sourceType = ""; + } diff --git a/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java b/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java index 4dee9a1f..eb5051d2 100644 --- a/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java +++ b/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java @@ -45,7 +45,7 @@ public interface ISimulationSystemConfigService { SdmResponse deleteFormConfigure(FormConfigure configure); - SdmResponse queryFormConfigure(String formName); + SdmResponse queryFormConfigure(String formName, String sourceType); SdmResponse listFormConfigure(FormConfigureReq req); diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index 88de5eb6..b809783d 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -341,10 +341,10 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS @Override @Transactional(rollbackFor = Exception.class) public SdmResponse addSystemFormConfigure(FormConfigure configure) { - // 管理员才能新增 - if(isNormalRole()){ - throw new RuntimeException("不支持普通用户新增，请联系系统管理员新增"); - } + // 管理员才能新增 --废弃 +// if(isNormalRole()){ +// throw new RuntimeException("不支持普通用户新增，请联系系统管理员新增"); +// } // 普通角色可以修改自定义字段 SdmResponse response = SdmResponse.success(); Long tenantId = ThreadLocalContext.getTenantId(); @@ -416,10 +416,10 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS @Override @Transactional(rollbackFor = Exception.class) public SdmResponse updateSystemFormConfigure(FormConfigure configure) { - boolean normalRole = isNormalRole(); +// boolean normalRole = isNormalRole(); // 普通用户修改 - if (normalRole) { - +// if (normalRole) { + if (!Objects.equals("sys",configure.sourceType)) { // 调用抽取后的普通用户修改方法 return handleNormalUserUpdate(configure); } @@ -452,10 +452,10 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS @Override @Transactional(rollbackFor = Exception.class) public SdmResponse deleteFormConfigure(FormConfigure configure) { - // 管理员才能删除 - if(isNormalRole()){ - throw new RuntimeException("不支持普通用户删除，请联系系统管理员删除"); - } + // 管理员才能删除 --废弃 +// if(isNormalRole()){ +// throw new RuntimeException("不支持普通用户删除，请联系系统管理员删除"); +// } if(!formConfigureService.removeById(configure.id)) { return SdmResponse.failed("删除表单配置失败"); } @@ -477,7 +477,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS * @param formName * @return */ - public SdmResponse queryFormConfigure(String formName) + public SdmResponse queryFormConfigure(String formName, String sourceType) { SdmResponse response = SdmResponse.success(); long tenantId = ThreadLocalContext.getTenantId(); @@ -486,8 +486,9 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS { response = SdmResponse.failed("表单不存在"); } - // 普通用户展示替换自定义 - if (isNormalRole()) { + // 普通用户展示替换自定义 -- 废弃 +// if (isNormalRole()) { + if (!Objects.equals("sys",sourceType)) { // 调用抽取后的方法处理用户自定义配置替换 replaceWithSingleUserCustomConfig(formConfigure); } @@ -510,8 +511,10 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS if (CollectionUtils.isEmpty(list)) { return SdmResponse.success(); } - // 普通用户展示替换自定义 - if (isNormalRole()) { + // 普通用户展示替换自定义--废弃 +// if (isNormalRole()) { + // 非系统页面查看，替换自定义数据查询 + if (!Objects.equals("sys",req.sourceType)) { // 调用抽取后的方法处理用户自定义配置替换 replaceWithUserCustomConfig(list); }