From 580d2bd45483d8a7b96a908815617efdf45ee202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 10 Mar 2023 15:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91CategoryCodeRule?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/rule/CategoryCodeRule.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/rule/CategoryCodeRule.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/rule/CategoryCodeRule.java index 49dc53cc..aa434ce5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/rule/CategoryCodeRule.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/rule/CategoryCodeRule.java @@ -26,15 +26,7 @@ public class CategoryCodeRule implements IFillRuleHandler { String categoryPid = ROOT_PID_VALUE; String categoryCode = null; - if (formData != null && formData.size() > 0) { - Object obj = formData.get("pid"); - if (oConvertUtils.isNotEmpty(obj)) categoryPid = obj.toString(); - } else { - if (params != null) { - Object obj = params.get("pid"); - if (oConvertUtils.isNotEmpty(obj)) categoryPid = obj.toString(); - } - } + categoryPid = getCateGoryPid(params, formData, categoryPid); /* * 分成三种情况 @@ -61,4 +53,21 @@ public class CategoryCodeRule implements IFillRuleHandler { } return categoryCode; } + + private String getCateGoryPid(JSONObject params, JSONObject formData, String categoryPid) { + if (formData != null && formData.size() > 0) { + Object obj = formData.get("pid"); + if (oConvertUtils.isNotEmpty(obj)) { + categoryPid = obj.toString(); + } + } else { + if (params != null) { + Object obj = params.get("pid"); + if (oConvertUtils.isNotEmpty(obj)) { + categoryPid = obj.toString(); + } + } + } + return categoryPid; + } }