3.2.5 bug修复

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

@@ -165,6 +165,7 @@ public class ConditionServiceImpl implements ConditionService {
         SysOrg rootOrg = sysOrgService.findRootOrg(schoolId);
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysOrg::getParentId, rootOrg.getId())
+                .isNull(SysOrg::getType)
                 .orderByAsc(SysOrg::getCreateTime);
         return sysOrgService.list(queryWrapper);
     }

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

@@ -12,6 +12,7 @@ import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.entity.TeachClazz;
 import com.qmth.distributed.print.business.enums.DictionaryEnum;
 import com.qmth.distributed.print.business.enums.LoginTypeEnum;
+import com.qmth.distributed.print.business.service.ConditionService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.service.TBSyncTaskService;
 import com.qmth.distributed.print.business.service.TeachClazzService;
@@ -112,6 +113,9 @@ public class SysController {
     @Resource
     BasicOperationLogService basicOperationLogService;
 
+    @Resource
+    ConditionService conditionService;
+
     /**
      * 登录
      *
@@ -656,13 +660,24 @@ public class SysController {
                 }).collect(Collectors.toList());
                 break;
             case COLLEGE:
-                List<BasicCollege> basicCollegeList = basicCollegeService.list(new QueryWrapper<BasicCollege>().lambda().eq(BasicCollege::getSchoolId, schoolId));
-                dictionaryResultList = basicCollegeList.stream().map(e -> {
-                    DictionaryResult dictionaryResult = new DictionaryResult();
-                    dictionaryResult.setId(e.getId());
-                    dictionaryResult.setName(e.getCollegeName());
-                    return dictionaryResult;
-                }).collect(Collectors.toList());
+                String privilegeId = ServletUtil.getCurrentPrivilegeId().toString();
+                if ("392".equals(privilegeId)) {
+                    List<SysOrg> sysOrgs = conditionService.listCollege();
+                    dictionaryResultList = sysOrgs.stream().map(e -> {
+                        DictionaryResult dictionaryResult = new DictionaryResult();
+                        dictionaryResult.setId(e.getId());
+                        dictionaryResult.setName(e.getName());
+                        return dictionaryResult;
+                    }).collect(Collectors.toList());
+                } else {
+                    List<BasicCollege> basicCollegeList = basicCollegeService.list(new QueryWrapper<BasicCollege>().lambda().eq(BasicCollege::getSchoolId, schoolId));
+                    dictionaryResultList = basicCollegeList.stream().map(e -> {
+                        DictionaryResult dictionaryResult = new DictionaryResult();
+                        dictionaryResult.setId(e.getId());
+                        dictionaryResult.setName(e.getCollegeName());
+                        return dictionaryResult;
+                    }).collect(Collectors.toList());
+                }
                 break;
 //            case COLLEGE:
 //                if (Objects.nonNull(semesterId)) {