helixiao před 1 rokem
rodič
revize
382e9fc946

+ 10 - 4
src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -54,6 +54,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +80,7 @@ import static com.ydtech.constants.RedisConstant.PHONE_VERIFICATION_CODE_KEY;
 @Api(tags = "用户控制器")
 @RequestMapping("user")
 @RequiredArgsConstructor
+@Slf4j
 public class SysUserController extends BaseController {
 
     private final SysUserService sysUserService;
@@ -879,9 +881,10 @@ public class SysUserController extends BaseController {
         return sysUserService.saveUserInfo(sysUserVo);
     }
 
-    @ApiOperation(value = "保存用户基本详情信息")
+    @ApiOperation(value = "保存合伙人、管理员用户基本详情信息")
     @PostMapping(value = "/saveUserInfoByPartner")
     public HttpResult saveUserInfoByPartner(@RequestBody SysUser2Vo sysUserVo) {
+        log.info("添加合伙人入参:{}",sysUserVo);
         //by gws 21	团队长 20	代理人 必须归属团队
         // 22	后线人员 必须归属部门
         SysUser sysUser = sysUserVo.getSysUser();
@@ -935,9 +938,10 @@ public class SysUserController extends BaseController {
         return sysUserService.saveUserInfoByPartner(sysUserVo);
     }
 
-    @ApiOperation(value = "保存用户基本详情信息")
+    @ApiOperation(value = "保存团队长用户基本详情信息")
     @PostMapping(value = "/saveTeamLeader")
     public HttpResult saveTeamLeader(@RequestBody SysUser2Vo sysUserVo) {
+        log.info("添加团队入参:{}",sysUserVo);
         SysUser sysUser = sysUserVo.getSysUser();
         sysUser.setType(3);
         SysUserInfo sysUserInfo = new SysUserInfo();
@@ -945,8 +949,10 @@ public class SysUserController extends BaseController {
         sysUserInfo.setBirthday(birthday);
         sysUserVo.setSysUserInfo(sysUserInfo);
         // 先创建工作室下的团队
-        List<SysDept> sysDeptList = sysDeptService.list(new LambdaQueryWrapper<SysDept>().eq(SysDept::getLeaderId, sysUser.getReferrerId()));
-        SysDept sysDept = sysDeptList.get(0);
+        SysAgencyLeader sysAgencyLeader = sysAgencyLeaderService.getOne(new LambdaQueryWrapper<SysAgencyLeader>()
+                .eq(SysAgencyLeader::getUserId, sysUser.getReferrerId()));
+        SysDept sysDept = sysDeptService.getOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, sysAgencyLeader.getDeptId()));
+//        SysDept sysDept = sysDeptList.get(0);
         SysDeptVo sysDeptVo = new SysDeptVo();
         sysDeptVo.setName(sysUser.getName() + "团队"); // 以人名设置工作室名称
         sysDeptVo.setDeptType("D"); // 默认为子公司