涉密等级查询条件

huigou-core-api/src/main/java/com/huigou/uasp/bmp/opm/domain/query/OrgQueryModel.java

@@ -319,7 +319,7 @@ public class OrgQueryModel extends QueryModel {
                 }
                 Integer personSecurityGradeSequence = Optional.ofNullable(personSecurityGradeDictionary.get(personSecurityGrade))
                         .map(DictionaryDesc::getSequence)
-                        .orElse(null);
+                        .orElseThrow(() -> new IllegalArgumentException(String.format("无效的涉密等级: %s", personSecurityGrade)));
                 this.putParam(paramName, personSecurityGradeSequence);
             }
             condition.append("))");
@@ -329,7 +329,7 @@ public class OrgQueryModel extends QueryModel {
             condition.append(" and (o.org_kind_id<>'psm' or dd.sequence >= :minPersonSecurityGrade)");
             Integer personSecurityGradeSequence = Optional.ofNullable(personSecurityGradeDictionary.get(minPersonSecurityGrade))
                     .map(DictionaryDesc::getSequence)
-                    .orElse(null);
+                    .orElseThrow(() -> new IllegalArgumentException(String.format("无效的涉密等级: %s", minPersonSecurityGrade)));
             putParam("minPersonSecurityGrade", personSecurityGradeSequence);
         }
         String maxPersonSecurityGrade = inputParams.getString("maxPersonSecurityGrade");
@@ -337,7 +337,7 @@ public class OrgQueryModel extends QueryModel {
             condition.append(" and (o.org_kind_id<>'psm' or dd.sequence <= :maxPersonSecurityGrade)");
             Integer personSecurityGradeSequence = Optional.ofNullable(personSecurityGradeDictionary.get(maxPersonSecurityGrade))
                     .map(DictionaryDesc::getSequence)
-                    .orElse(null);
+                    .orElseThrow(() -> new IllegalArgumentException(String.format("无效的涉密等级: %s", maxPersonSecurityGrade)));
             putParam("maxPersonSecurityGrade", personSecurityGradeSequence);
         }
         this.countCondition.append(condition);