bug修复

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/enums/CollegeEnum.java

@@ -28,7 +28,9 @@ public enum CollegeEnum {
     COMPANY("COMPANY"),
 
     /** 部门 */
-    DEPT("DEPT");
+    DEPT("DEPT"),
+
+    COLLEGE("COLLEGE");
 
     private final String value;
 
@@ -37,7 +39,7 @@ public enum CollegeEnum {
     }
 
     public static void validate(String value) {
-        boolean flag = COMPANY.getValue().equals(value) || DEPT.getValue().equals(value);
+        boolean flag = COMPANY.getValue().equals(value) || DEPT.getValue().equals(value)|| COLLEGE.getValue().equals(value);
         if(!flag) {
             throw new CommonException("不支持的组织分类：{}", value);
         }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/MajorMapper.xml

@@ -13,11 +13,10 @@
         FROM
             major a
         LEFT JOIN SYS_ORG b ON a.college_id = b.id
-       <where>
+       where a.DELETE_FLAG='NOT_DELETE'
         <if test="majorPageParam.searchKey!=null">
-            a.major_name like concat('%',#{majorPageParam.searchKey},'%')
+            and a.major_name like concat('%',#{majorPageParam.searchKey},'%')
         </if>
-       </where>
        order by a.create_time desc
     </select>
 
@@ -49,6 +48,7 @@
         FROM
             major a
                 LEFT JOIN SYS_ORG b ON a.college_id = b.id
-        where  a.college_id=#{collegeId}
+        where a.DELETE_FLAG='NOT_DELETE'
+        and a.college_id=#{collegeId}
     </select>
 </mapper>

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/enums/SysOrgCategoryEnum.java

@@ -39,7 +39,7 @@ public enum SysOrgCategoryEnum {
     }
 
     public static void validate(String value) {
-        boolean flag = COMPANY.getValue().equals(value) || DEPT.getValue().equals(value);
+        boolean flag = COMPANY.getValue().equals(value) || DEPT.getValue().equals(value)|| COLLEGE.getValue().equals(value);
         if(!flag) {
             throw new CommonException("不支持的组织分类：{}", value);
         }