Explorar el Código

app工作室添加

Qchen hace 1 año
padre
commit
8bd9695519

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

@@ -499,23 +499,16 @@ public class SysUserController extends BaseController {
                 SysPartnerDto sysPartnerDto = new SysPartnerDto();
                 sysPartnerDto.setUserId(sysUser.getId());
                 sysPartnerDto.setUserName(sysUser.getName());
-                sysPartnerDto.setSuggestId(sysUser.getSuggestId());
+                sysPartnerDto.setSuggestId(sysUser.getReferrerId());
                 sysPartnerDto.setLevel(sysUser.getLevel());
                 sysPartnerService.insert(sysPartnerDto);
             }
         } else if (type == 2){
             SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
-            SysAgencyLeaderDto sysAgencyLeaderDto = new SysAgencyLeaderDto();
-            sysAgencyLeaderDto.setUserId(sysUser.getId());
-            sysAgencyLeaderDto.setUserName(sysUser.getName());
-            sysAgencyLeaderDto.setDeptId(sysUser.getDeptId());
-            sysAgencyLeaderDto.setDeptName(sysUser.getDeptName());
-            sysAgencyLeaderDto.setSource(sysDept.getManagementSource());
-            sysAgencyLeaderDto.setSuggestId(sysUser.getSuggestId());
-            sysAgencyLeaderDto.setSuggestName(sysUser.getSuggestName());
-            sysAgencyLeaderService.insert(sysAgencyLeaderDto);
+            SysUser sysUserReferrerId = sysUserService.getById(sysUser.getReferrerId());
             SysDeptVo sysDeptVo = new SysDeptVo();
             sysDeptVo.setComlevel("5"); // 默认机构等级为5级
+            sysDeptVo.setComtype(sysUser.getDeptType());
             sysDeptVo.setName(sysUser.getName() + "工作室"); // 以人名设置工作室名称
             sysDeptVo.setDeptType("C"); // 默认为子公司
             sysDeptVo.setParentId(sysDept.getParentId());
@@ -528,11 +521,23 @@ public class SysUserController extends BaseController {
             sysDeptVo.setArea(sysDeptVo.getArea()); // 默认区县与负责人所在机构一样
             sysDeptVo.setAddress(""); // 工作室地址
             sysDeptService.addDept(sysDeptVo);
+            SysAgencyLeaderDto sysAgencyLeaderDto = new SysAgencyLeaderDto();
+            sysAgencyLeaderDto.setUserId(sysUser.getId());
+            sysAgencyLeaderDto.setUserName(sysUser.getName());
+            sysAgencyLeaderDto.setDeptId(sysDeptVo.getId());
+            sysAgencyLeaderDto.setDeptName(sysDeptVo.getName());
+            sysAgencyLeaderDto.setSource(sysUser.getDeptSource());
+            sysAgencyLeaderDto.setComlevel(sysDeptVo.getComlevel());
+            sysAgencyLeaderDto.setSuggestId(sysUser.getReferrerId());
+            sysAgencyLeaderDto.setSuggestName(sysUser.getSuggestName());
+            sysAgencyLeaderDto.setSuggestLevel(sysUserReferrerId.getLevel());
+            sysAgencyLeaderService.insert(sysAgencyLeaderDto);
 
         }
         return HttpResult.ok(sysUserService.updateById(sysUser));
     }
 
+
     @ApiOperation(value = "(重构)审批不通过")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户ID"),

+ 4 - 0
src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -243,6 +243,10 @@ public class SysUser extends BaseEntity {
     @TableField(value = "dept_source")
     private String deptSource;
 
+    @ApiModelProperty(value = "申请机构类型 股份 直营 加盟" )
+    @TableField(value = "dept_type")
+    private String deptType;
+
     /**
      * 验证用户
      *

+ 2 - 0
src/main/java/com/ydtech/modules/admin/model/dto/SysAgencyLeaderDto.java

@@ -54,4 +54,6 @@ public class SysAgencyLeaderDto {
     @ApiModelProperty(value = "推荐人name")
     private String suggestName;
 
+    @ApiModelProperty(value = "推荐人等级")
+    private int suggestLevel;
 }

+ 1 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -124,6 +124,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
             sysRelationPerson.setAgencyLeaderId(sysAgencyLeader.getUserId());
             sysRelationPerson.setCreateBy(user.getId());
             sysRelationPerson.setCreateTime(new Date());
+            sysRelationPerson.setSuggestLevel(sysAgencyLeaderDto.getSuggestLevel());
             sysRelationPerson.setSuggestId(sysAgencyLeaderDto.getSuggestId());
             sysRelationPerson.setSource(0);
             sysRelationPerson.setType(1);