Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -60,6 +60,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -463,6 +464,13 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             if (!subjectNames.contains(student.getSubjectName())) {
                 errMsg.add(String.format("第%s行声部不支持", msgRowNo));
             }
+            try {
+                if(!StringUtils.isEmpty(student.getBirthday())){
+                    LocalDate.parse(student.getBirthday(), DateTimeFormatter.ISO_LOCAL_DATE);
+                }
+            }catch (Exception e) {
+                errMsg.add(String.format("第%s行生日格式错误", msgRowNo));
+            }
 
             if (errMsg.size() > 100) {
                 break;

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -64,7 +64,7 @@
                 )
             </if>
             <if test="client.code == 'STUDENT'">
-                AND t.tenant_id_ == -1
+                AND t.tenant_id_ = -1
             </if>
         </where>
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TeacherController.java

@@ -114,10 +114,8 @@ public class TeacherController extends BaseController {
             if (teacher == null) {
                 throw new BizException("老师不存在");
             }
-        } else {
-            // 新增 默认机构为操作人的机构
-            teacherSubmitReq.setTenantId(tenantInfo.getId());
         }
+        teacherSubmitReq.setTenantId(tenantInfo.getId());
         return teacherService.submit(teacherSubmitReq);
     }