BUGFIX:1.查询组织接口完善 2.设置默认的二级印花分类 3.教育管理员登录时过期处理

src/main/java/com/ai/da/model/dto/QueryOrganizationPageDTO.java

@@ -0,0 +1,23 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+@NoArgsConstructor
+public class QueryOrganizationPageDTO extends QueryPageByTimeDTO{
+    @ApiModelProperty("组织类型 Enterprise || Education")
+    private String type;
+    @ApiModelProperty("组织名字")
+    private String name;
+
+    public QueryOrganizationPageDTO(String type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+}

src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java

@@ -1,6 +1,7 @@
 package com.ai.da.model.enums;
 
 import com.fasterxml.jackson.annotation.JsonValue;
+import io.netty.util.internal.StringUtil;
 
 public enum PrintboardLevel2TypeEnum implements IEnumDisplay {
     PATTERN("图案", "Pattern"),
@@ -41,6 +42,9 @@ public enum PrintboardLevel2TypeEnum implements IEnumDisplay {
 
     // 根据名称获取枚举值
     public static PrintboardLevel2TypeEnum fromName(String name) {
+        if (StringUtil.isNullOrEmpty(name)){
+            return PrintboardLevel2TypeEnum.PATTERN;
+        }
         for (PrintboardLevel2TypeEnum designElement : PrintboardLevel2TypeEnum.values()) {
             if (designElement.english.equals(name)) {
                 return designElement;