From 27c5ba10b1794bc35733493887dd4a50661c4a00 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 11 Jan 2023 16:11:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= =?UTF-8?q?-=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskmanage/entity/RiskManageRegulationGroupApply.java | 4 ++++ .../extend/riskmanage/service/impl/RiskManageServiceImpl.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java index 40e88b3..041ecb7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java @@ -49,6 +49,10 @@ public class RiskManageRegulationGroupApply implements Serializable { private String cityOu; @ApiModelProperty("市名") private String cityName; + @ApiModelProperty("部门ou") + private String departmentOu; + @ApiModelProperty("部门名") + private String departmentName; @ApiModelProperty("应用规则所需的参数") private List outerVoList; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java index 239abfd..a73145c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java @@ -58,6 +58,9 @@ public class RiskManageServiceImpl implements IRiskManageService { //项目所属市 regulationGroupApply.setCityOu(Objects.isNull(params.get("cityOu"))?"":params.get("cityOu").toString()); regulationGroupApply.setCityName(Objects.isNull(params.get("cityName"))?"":params.get("cityName").toString()); + //项目所属市 + regulationGroupApply.setDepartmentOu(Objects.isNull(params.get("departmentOu"))?"":params.get("departmentOu").toString()); + regulationGroupApply.setDepartmentName(Objects.isNull(params.get("departmentName"))?"":params.get("departmentName").toString()); //模块分类 regulationGroupApply.setCallCategoryCode(regulation.getCallCategory()); regulationGroupApply.setCallCategoryName(regulation.getCallCategoryName()); From 5432dec2996f8ae433be18a161d613533119bcc1 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Wed, 11 Jan 2023 16:12:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E9=A3=8E=E6=8E=A7=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7?= =?UTF-8?q?-=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/riskmanage/service/impl/RiskManageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java index a73145c..729e1d6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java @@ -58,7 +58,7 @@ public class RiskManageServiceImpl implements IRiskManageService { //项目所属市 regulationGroupApply.setCityOu(Objects.isNull(params.get("cityOu"))?"":params.get("cityOu").toString()); regulationGroupApply.setCityName(Objects.isNull(params.get("cityName"))?"":params.get("cityName").toString()); - //项目所属市 + //项目所属部门 regulationGroupApply.setDepartmentOu(Objects.isNull(params.get("departmentOu"))?"":params.get("departmentOu").toString()); regulationGroupApply.setDepartmentName(Objects.isNull(params.get("departmentName"))?"":params.get("departmentName").toString()); //模块分类