update

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyBaseInfoDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
@@ -47,6 +48,8 @@ public class VipGroupManageController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
+    private TeacherDao teacherDao;
+    @Autowired
     private EmployeeDao employeeDao;
 
     @Autowired
@@ -59,15 +62,20 @@ public class VipGroupManageController extends BaseController {
     @PostMapping("/vipGroupApply")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/vipGroupApply')")
     public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto){
-        SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyDto.getVipGroupApplyBaseInfo().getUserId());
-        if(Objects.isNull(sysUser)){
-            return failed("请指定指导老师!");
-        }
-        vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(sysUser.getOrganId());
-        sysUser = sysUserFeignService.queryUserInfo();
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
+        Integer userId = vipGroupApplyDto.getVipGroupApplyBaseInfo().getUserId();
+        Teacher teacher = teacherDao.get(userId);
+        if(Objects.isNull(teacher)){
+            return failed("请指定指导老师!");
+        }
+        if(StringUtils.isEmpty(sysUser.getOrganId()) || sysUser.getOrganId().contains(",")){
+            vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(teacher.getTeacherOrganId());
+        }else {
+            vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(Integer.parseInt(sysUser.getOrganId()));
+        }
         vipGroupService.createVipGroup(vipGroupApplyDto);
         return succeed();
     }