Merge remote-tracking branch 'origin/dev_v3.2.0' into dev_v3.2.0

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

@@ -477,17 +477,25 @@ public class GradeBatchServiceImpl extends ServiceImpl<GradeBatchMapper, GradeBa
             if (orgIds.size() != 1) {
                 throw ExceptionResultEnum.SUCCESS.exception("任课老师" + key[0] + "对应课程不能属于不同学院");
             }
+            Long courseSecondaryOrgId = orgIds.get(0);
 
             SysUser sysUser;
             if (sysUserList.isEmpty()) {
                 //新增
                 sysUser = new SysUser(schoolId, key[0], key[1], null, true);
                 sysUser.setCode(key[0]);
-                sysUser.setOrgId(orgIds.get(0));
+                sysUser.setOrgId(courseSecondaryOrgId);
                 sysUserService.save(sysUser);
             } else {
                 //修改
                 sysUser = sysUserList.get(0);
+                Long orgId = sysUser.getOrgId();
+                SysOrg userSecondaryOrg = sysOrgService.findCollegeLevelOrgByOrgId(orgId);
+                Long userSecondaryOrgId = userSecondaryOrg.getId();
+                if (!courseSecondaryOrgId.equals(userSecondaryOrgId)){
+                    throw ExceptionResultEnum.ERROR.exception("导入的excel中，工号为【" + key[0] + "】的用户所在学院为【" + userSecondaryOrg.getName() +
+                            "】，和课程所在学院【" + sysOrgService.getById(courseSecondaryOrgId).getName() + "】不一致");
+                }
                 String dbRealName = sysUser.getRealName();
                 if (!dbRealName.equals(key[1])){
                     throw ExceptionResultEnum.ERROR.exception("导入的excel中，工号为【" + key[0] + "】的用户姓名【" + key[1] +
@@ -495,7 +503,6 @@ public class GradeBatchServiceImpl extends ServiceImpl<GradeBatchMapper, GradeBa
                 }
                 sysUser.setRealName(key[1]);
                 sysUser.setEnable(true);
-                sysUser.setOrgId(orgIds.get(0));
                 sysUserService.updateById(sysUser);
             }