去掉机构

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/DictionaryEnum.java

@@ -10,7 +10,7 @@ import java.util.Objects;
 public enum DictionaryEnum {
     CAMPUS("校区"),
     SEMESTER("学期"),
-    COLLEGE("学院"),
+//    COLLEGE("学院"),
     MAJOR("专业"),
     CLAZZ("班级"),
     ALL_CLAZZ("教学班和基础班"),

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -665,7 +665,8 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     @Override
     public List<BasicCourse> list(String param, List<Long> printPlanIdList, Long teachingRoomId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(teachingRoomId);
+//        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(teachingRoomId);
+        Set<Long> orgIds = new HashSet<>(Arrays.asList(teachingRoomId));
         if (printPlanIdList.size() == 0) {
             QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)

distributed-print/src/main/java/com/qmth/distributed/print/api/SysOrgController.java

@@ -2,16 +2,13 @@ package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.enums.userPush.SpecialPrivilegeEnum;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -95,11 +92,8 @@ public class SysOrgController {
      */
     @ApiOperation(value = "根据类型查询机构")
     @RequestMapping(value = "/find_by_type", method = RequestMethod.POST)
-    public Result findByType(@ApiParam(value = "机构类型") @RequestParam OrgTypeEnum orgType,
-                             @ApiParam(value = "某机构下的集合") @RequestParam(required = false) String orgId,
-                             @ApiParam(value = "是否使用当前用户所在机构的数据权限") @RequestParam(required = false) boolean auth) {
-        return ResultUtil.ok(sysOrgService.findDeepByOrgIdAndType(orgType, SystemConstant.convertIdToLong(orgId),auth));
+    public Result findByType() {
+        return ResultUtil.ok(sysOrgService.findDeepByOrgIdAndType());
     }
-
 }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -35,7 +35,7 @@ public class SystemConstant {
      * 系统常量
      */
     public static final String CHARSET_NAME = "UTF-8";
-    public static final String CHARSET_GB2312 = "gb2312";
+    //    public static final String CHARSET_GB2312 = "gb2312";
     public static final String CHARSET_GBK = "gbk";
     public static final Charset CHARSET = Charset.forName(CHARSET_NAME);
     public static final String MD5 = "MD5";
@@ -79,7 +79,7 @@ public class SystemConstant {
     public static final String PDF_PREFIX = ".pdf";
     public static final String FTL_PREFIX = ".ftl";
     public static final String ZIP_PREFIX = ".zip";
-    public static final String JPG_PREFIX = ".jpg";
+//    public static final String JPG_PREFIX = ".jpg";
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final int PAGE_NUMBER = 0;
     public static final int PAGE_SIZE = 10000000;
@@ -93,7 +93,7 @@ public class SystemConstant {
     public static final String COMMA = ",";
     public static final int FINAL_SCALE = 1;
     public static final int CALCULATE_SCALE = 4;
-    public static final int OPER_SCALE = 8;
+//    public static final int OPER_SCALE = 8;
     public static final BigDecimal PERCENT = new BigDecimal(100);
     public static final String HYPHEN = "-";
     public static final String DEFAULT_SIGN = "#";
@@ -121,7 +121,7 @@ public class SystemConstant {
     /**
      * oss url过期时间
      */
-    public static final int OSS_URL_EXPIRE = 5 * 60 * 1000;//过期时间5分钟
+//    public static final int OSS_URL_EXPIRE = 5 * 60 * 1000;//过期时间5分钟
 
     /**
      * 缓存配置
@@ -135,7 +135,6 @@ public class SystemConstant {
     public static final String PRIVILEGE_URL_CACHE = "privilege:url:cache";
     public static final String ROLE_PRIVILEGE_CACHE = "role:privilege:cache";
     public static final String USER_ROLE_PRIVILEGE_CACHE = "user:role:privilege:cache";
-    public static final String PDF_CACHE = "pdf:cache";
     public static final String ROLE_CACHE = "role:cache";
     public static final String AUTH_INFO_CACHE = "auth:info:cache";
     public static final String TXT_CHARSET_CACHE = "charset:txt:cache";
@@ -165,7 +164,6 @@ public class SystemConstant {
      */
     public static final int DEFAULT_SESSION_EXPIRE = 1;//过期时间1天
     public static final long REDIS_DEFAULT_EXPIRE_TIME = 24 * 60L * 60L;//过期时间24小时
-    public static final long REDIS_CREATE_PDF_EXPIRE_TIME = 1 * 60L * 60L;//过期时间1小时
     public static final long REDIS_THIRD_USER_AUTH_EXPIRE_TIME = 2 * 60L;//过期时间2分钟
 
     /**
@@ -194,7 +192,6 @@ public class SystemConstant {
     public static final String AES_MODE_PKCS7 = "AES/CBC/PKCS7Padding";//用这个模式，规则必须为16位
     public static final String AES_RULE = "1234567890123456";//aes密钥
 
-
     /**
      * 变量
      */
@@ -230,8 +227,6 @@ public class SystemConstant {
     /**
      * activiti
      */
-    public static final String GDYKDX_FLOW_KEY = "GdykdxPaperApprove";//广药流程key
-    public static final String JXZYY_FLOW_KEY = "JxzyyPaperApprove";//江西流程key
     public static final String APPROVE_ID = "approveId";//审批id
     public static final String FLOW_SUBMIT = "flowSubmit";//命题提交申请
     public static final String FLOW_JOIN_TYPE = "flowJoinType";//流程关联类型

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysOrgMapper.java

@@ -35,6 +35,15 @@ public interface SysOrgMapper extends CustomBaseMapper<SysOrg> {
      */
     List<SysOrg> findByConnectByRootOrgId(@Param("orgId") Long orgId);
 
+    /**
+     * 递归树查询(同级及以下)
+     *
+     * @param orgId
+     * @param filter
+     * @return
+     */
+    List<SysOrg> findByConnectByRootOrgIdAndFilter(@Param("orgId") Long orgId, @Param("filter") boolean filter);
+
     /**
      * 获取所有机构
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysOrgService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.common.bean.dto.OrgDto;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.enums.userPush.SpecialPrivilegeEnum;
 
 import java.util.List;
@@ -83,13 +82,9 @@ public interface SysOrgService extends IService<SysOrg> {
 
     /**
      * 查询符合条件的机构
-     *
-     * @param orgTypeEnum 机构类型
-     * @param orgId       某机构下级的全部符合条件的机构
-     * @param auth        使用当前用户所在机构数据权限的机构
      * @return 符合条件的机构
      */
-    List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum, Long orgId, boolean auth);
+    List<SysOrg> findDeepByOrgIdAndType();
 
     /**
      * 根据机构id查询他的父亲们

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -19,7 +19,6 @@ import com.qmth.teachcloud.common.mapper.SysOrgMapper;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.service.SysRoleService;
 import com.qmth.teachcloud.common.service.SysUserService;
-import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.collections4.CollectionUtils;
@@ -52,9 +51,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Resource
     SysOrgMapper sysOrgMapper;
 
-    @Resource
-    TeachcloudCommonService teachcloudCommonService;
-
 //    @Resource
 //    BasicCampusService basicCampusService;
 
@@ -347,27 +343,31 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
-    public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum, Long orgId, boolean auth) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = new HashSet<>(); // 下级机构集合
-        Set<Long> authOrgIdSet = new HashSet<>(); // 当前用户数据权限下的机构集合
-        Set<Long> orgIdSet = new HashSet<>(); // 输入机构下的所有下级机构集合
-        if (auth) {
-            authOrgIdSet = teachcloudCommonService.listSubOrgIds(null);
-        }
-        if (SystemConstant.longNotNull(orgId)) {
-            orgIdSet = teachcloudCommonService.listSubOrgIds(orgId);
-        }
-        orgIds.addAll(authOrgIdSet);
-        orgIds.addAll(orgIdSet);
-        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId)
-                .eq(SysOrg::getType, orgTypeEnum)
-                .eq(SysOrg::getEnable, true);
-        if (orgIds.size() > 0) {
-            queryWrapper.lambda().in(SysOrg::getId, orgIds);
-        }
-        return this.list(queryWrapper);
+    public List<SysOrg> findDeepByOrgIdAndType() {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return sysOrgMapper.findByConnectByRootOrgIdAndFilter(sysUser.getOrgId(), true);
+//        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+//        Set<Long> orgIds = new HashSet<>(); // 下级机构集合
+//        Set<Long> authOrgIdSet = new HashSet<>(); // 当前用户数据权限下的机构集合
+//        Set<Long> orgIdSet = new HashSet<>(); // 输入机构下的所有下级机构集合
+//        if (auth) {
+//            authOrgIdSet = teachcloudCommonService.listSubOrgIds(null);
+//        }
+//        if (SystemConstant.longNotNull(orgId)) {
+//            orgIdSet = teachcloudCommonService.listSubOrgIds(orgId);
+//        }
+//        orgIds.addAll(authOrgIdSet);
+//        orgIds.addAll(orgIdSet);
+//        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId);
+//        if (Objects.nonNull(orgTypeEnum)) {
+//            queryWrapper.lambda().eq(SysOrg::getType, orgTypeEnum);
+//        }
+//        queryWrapper.lambda().eq(SysOrg::getEnable, true);
+//        if (orgIds.size() > 0) {
+//            queryWrapper.lambda().in(SysOrg::getId, orgIds);
+//        }
+//        return this.list(queryWrapper);
     }
 
     @Override
@@ -400,8 +400,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         for (String orgInfo : orgInfoList) {
             // 父机构id
             Long schoolId = requestUser.getSchoolId();
-            List<SysOrg> topLevelOrg = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId,schoolId).eq(SysOrg::getType,OrgTypeEnum.SCHOOL));
-            if (topLevelOrg.size() != 1){
+            List<SysOrg> topLevelOrg = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getType, OrgTypeEnum.SCHOOL));
+            if (topLevelOrg.size() != 1) {
                 throw ExceptionResultEnum.ERROR.exception("顶级机构信息获取异常");
             }
             Long parentId = topLevelOrg.get(0).getId();

teachcloud-common/src/main/resources/mapper/SysOrgMapper.xml

@@ -18,6 +18,13 @@
         SELECT so.* FROM sys_org so WHERE FIND_IN_SET(id, getRootChildId(#{orgId}))
     </select>
 
+    <select id="findByConnectByRootOrgIdAndFilter" resultType="com.qmth.teachcloud.common.entity.SysOrg">
+        SELECT so.* FROM sys_org so WHERE FIND_IN_SET(id, getRootChildId(#{orgId}))
+        <if test="filter != null and filter != '' and filter == 1">
+            and so.`type` is null
+        </if>
+    </select>
+
     <select id="listOrgAll" resultType="com.qmth.teachcloud.common.bean.dto.OrgDto">
         select
             so.id,