1.接口同步

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

@@ -79,6 +79,7 @@ public class TeacherController extends BaseController {
         TenantInfo tenantInfo = getTenantInfo();
         query.setTenantId(tenantInfo.getId());
         query.setDelFlag(YesOrNoEnum.NO);
+        query.setLockFlag(UserLockFlag.NORMAL);
         query.setOrderBy("u.username_ asc");
 
         IPage<TeacherVo> pages = teacherService.selectPage(PageUtil.getPage(query), query);
@@ -107,17 +108,20 @@ public class TeacherController extends BaseController {
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入teacher")
     public HttpResponseResult<Boolean> submit(@Valid @RequestBody TeacherSubmitReq teacherSubmitReq) {
-        TenantInfo tenantInfo = getTenantInfo();
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
+        if (tenantInfo == null) {
+            throw new BizException("非法请求");
+        }
         if (teacherSubmitReq.getUserId() != null) {
             Teacher teacher = teacherService.lambdaQuery().eq(Teacher::getUserId, teacherSubmitReq.getUserId())
                     .eq(Teacher::getTenantId, tenantInfo.getId()).last("limit 1").one();
             if (teacher == null) {
                 throw new BizException("老师不存在");
             }
-        } else {
-            // 新增 默认机构为操作人的机构
-            teacherSubmitReq.setTenantId(tenantInfo.getId());
         }
+        teacherSubmitReq.setTenantId(tenantInfo.getId());
+        teacherSubmitReq.setUpdateBy(sysUser.getId());
         return teacherService.submit(teacherSubmitReq);
     }