fix

pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java

@@ -290,22 +290,26 @@ public class ExpertUserInfoAssembler {
         }
 
         for (ExpertMetaApply expertMetaApply : expertMetaApplyList) {
-            String applyType = expertMetaApply.getApplyType();
-            RegionDtoMapKey regionDtoMapKey = new RegionDtoMapKey();
-            regionDtoMapKey.setRegionCode(expertMetaApply.getRegionCode());
-            regionDtoMapKey.setRegionLevel(expertMetaApply.getRegionLevel());
-            ExpertApplyTypeEnum typeEnum = ExpertApplyTypeEnum.of(applyType);
-            switch (typeEnum) {
-                case EXPERT_INTENTION_LEAVE: {
-                    set.remove(regionDtoMapKey);
-                }
-                break;
-                case EXPERT_INTENTION_JOIN: {
-                    set.add(regionDtoMapKey);
-                }
-                break;
-                default:
+            String regionCode = expertMetaApply.getRegionCode();
+            Integer regionLevel = expertMetaApply.getRegionLevel();
+            if (Objects.nonNull(regionLevel) && StringUtils.isNotBlank(regionCode)) {
+                String applyType = expertMetaApply.getApplyType();
+                RegionDtoMapKey regionDtoMapKey = new RegionDtoMapKey();
+                regionDtoMapKey.setRegionCode(regionCode);
+                regionDtoMapKey.setRegionLevel(regionLevel);
+                ExpertApplyTypeEnum typeEnum = ExpertApplyTypeEnum.of(applyType);
+                switch (typeEnum) {
+                    case EXPERT_INTENTION_LEAVE: {
+                        set.remove(regionDtoMapKey);
+                    }
                     break;
+                    case EXPERT_INTENTION_JOIN: {
+                        set.add(regionDtoMapKey);
+                    }
+                    break;
+                    default:
+                        break;
+                }
             }
         }
         return set.stream().map(r -> {

pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/RegionWrapperAssembler.java

@@ -35,5 +35,6 @@ public class RegionWrapperAssembler {
                         .ge(ExpertMetaApply::getRegionLevel, parentRegionTreeLevel));
             }
         }
+        wrapperQuery.orderByDesc(ExpertMetaApply::getUpdateOn);
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/validate/DingQrLoginException.java

@@ -0,0 +1,19 @@
+package com.ningdatech.pmapi.user.security.auth.validate;
+
+/**
+ * @author liuxinxin
+ * @date 2023/3/24 上午11:47
+ */
+
+public class DingQrLoginException extends RuntimeException {
+
+    private Integer code;
+
+    private String message;
+
+    public DingQrLoginException(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}