Merge remote-tracking branch 'origin/dev' into dev

safety-eval-app/pom.xml

@@ -46,10 +46,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                </configuration>
             </plugin>
         </plugins>
     </build>

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java

@@ -1,5 +1,6 @@
 package org.qinan.safetyeval.app.executor;
 
+import org.apache.commons.lang3.StringUtils;
 import org.qinan.safetyeval.client.api.OrgQualificationApi;
 import org.qinan.safetyeval.client.dto.PageResponse;
 import org.qinan.safetyeval.client.dto.SingleResponse;
@@ -113,10 +114,10 @@ public class OrgQualificationExecutor implements OrgQualificationApi {
 
     /** licenseTypeCode 可能为空（如营业执照），分组键回退到 licenseTypeName */
     private String resolveLicenseGroupKey(OrgQualificationCO co) {
-        if (co.getLicenseTypeCode() != null && !co.getLicenseTypeCode().isBlank()) {
+        if (StringUtils.isNotBlank(co.getLicenseTypeCode())) {
             return co.getLicenseTypeCode();
         }
-        if (co.getLicenseTypeName() != null && !co.getLicenseTypeName().isBlank()) {
+        if (StringUtils.isNotBlank(co.getLicenseTypeName())) {
             return co.getLicenseTypeName();
         }
         return "default";