Просмотр исходного кода

Merge branch 'mazq-bugfix-0819' into 'release/v2.4.0'

fix(审计范围报错修改): 审计范围报错修改

See merge request dcuc-tjdsj/auth-back!85
马志强 3 лет назад
Родитель
Сommit
7ae542a0c2

+ 3 - 1
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/MgeAuditRptController.java

@@ -114,7 +114,9 @@ public class MgeAuditRptController {
             if (!AdminObjectTypeEnum.GLY.getValue().equals(type) && !AdminObjectTypeEnum.PTCD.getValue().equals(type)) {
                 if (AdminObjectTypeEnum.JGGL.getValue().equals(type) || AdminObjectTypeEnum.RYGL.getValue().equals(type) || AdminObjectTypeEnum.SQGL.getValue().equals(type) || AdminObjectTypeEnum.GLYGL.getValue().equals(type)) {
                     ids = iOrgInfoFacade.changeIdsToNames(ids);
-                    ids = ids.replace(":-1", "(及其下属机构)").replace(":0", "").replace(":1", "").replace(":2", "(及其下属机构)");
+                    if(StringUtils.isNotBlank(ids)) {
+                        ids = ids.replace(":-1", "(及其下属机构)").replace(":0", "").replace(":1", "").replace(":2", "(及其下属机构)");
+                    }
                     mgeLog.setObjectName(ids);
                 }