Merge branch 'dev_v3.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.2.0

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

@@ -247,6 +247,9 @@ public class SysController {
         }
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(loginParam.getSchoolCode())) {
+            if (loginParam.getSchoolCode().contains("#")) {
+                loginParam.setSchoolCode(loginParam.getSchoolCode().substring(0, loginParam.getSchoolCode().indexOf("#")));
+            }
             BasicSchool basicSchool = commonCacheService.schoolCache(loginParam.getSchoolCode());
             if (Objects.nonNull(basicSchool)) {
                 wrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId());
@@ -295,6 +298,9 @@ public class SysController {
         String loginName = loginParam.getLoginName();
         String password = loginParam.getPassword();
         String schoolCode = loginParam.getSchoolCode();
+        if (Objects.nonNull(schoolCode) && schoolCode.contains("#")) {
+            schoolCode = schoolCode.substring(0, schoolCode.indexOf("#"));
+        }
         String mobileNumber = loginParam.getMobileNumber();
 
         if (StringUtils.isBlank(schoolCode)) {
@@ -589,7 +595,7 @@ public class SysController {
                 }).collect(Collectors.toList());
                 break;
             case COLLEGE:
-                List<BasicCollege> basicCollegeList = basicCollegeService.list(new QueryWrapper<BasicCollege>().lambda().eq(BasicCollege::getSchoolId,schoolId));
+                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());

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -200,6 +200,9 @@ public class SysController {
         String password = loginParam.getPassword();
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(loginParam.getSchoolCode())) {
+            if (loginParam.getSchoolCode().contains("#")) {
+                loginParam.setSchoolCode(loginParam.getSchoolCode().substring(0, loginParam.getSchoolCode().indexOf("#")));
+            }
             BasicSchool basicSchool = commonCacheService.schoolCache(loginParam.getSchoolCode());
             wrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId());
         }