|
@@ -5,11 +5,7 @@ import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
@@ -161,9 +157,9 @@ public class MusicGroupController extends BaseController {
|
|
|
if (musicGroup == null) {
|
|
|
return failed("乐团不存在");
|
|
|
}
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
|
|
|
- if (userId == null) {
|
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
+ if (sysUser != null && Objects.nonNull(sysUser.getId())) {
|
|
|
userId = sysUser.getId();
|
|
|
}
|
|
|
|
|
@@ -196,6 +192,9 @@ public class MusicGroupController extends BaseController {
|
|
|
}
|
|
|
studentRegistration.setOwnershipType(musicGroup.getOwnershipType());
|
|
|
studentRegistration.setChargeTypeId(musicGroup.getChargeTypeId());
|
|
|
+ if(sysUser != null){
|
|
|
+ studentRegistration.setGender(sysUser.getGender());
|
|
|
+ }
|
|
|
|
|
|
return succeed(studentRegistration);
|
|
|
}
|