注册接口新增数据优化

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -111,6 +111,36 @@ public class SysUserController extends BaseController
     private RemoteLogService remoteLogService;
     @Autowired
     private OwnSysUserMapper ownSysUserMapper;
+    @Autowired
+    private IOwnCompanyService ownCompanyService;
+    /**
+     * 默认父级id
+     */
+    private Long defaultId = 0L;
+    /**
+     * 默认祖级列表
+     */
+    private String defaultAn = "0";
+    /**
+     * 默认排序
+     */
+    private String defaultOrder = "1";
+    /**
+     * 数据权限1全部
+     */
+    private String dataScope = "1";
+    /**
+     * 是否关联显示
+     */
+    private boolean isCheck = true;
+    /**
+     * 默认状态0正常
+     */
+    private String status = "0";
+    /**
+     * 自动创建
+     */
+    private String isAuto = "1";
     /**
      * 用户注册成功
      */
@@ -1035,12 +1065,41 @@ public class SysUserController extends BaseController
         sysCompany.setScyName(company);
         sysCompany.setCreateTime(DateUtils.getNowDate());
         companyService.save(sysCompany);
+        //创建部门
+        SysDept dept = new SysDept();
+        dept.setCompanyId(id);
+        dept.setDeptName(company);
+        dept.setParentId(defaultId);
+        dept.setAncestors(defaultAn);
+        dept.setOrderNum(defaultOrder);
+        deptService.insertDept(dept);
+        List<SysDept> deptList= deptService.selectDeptList(dept);
+        //部门id
+        Long deptId = deptList.get(0).getDeptId();
+        //创建角色
+        SysRole sysRole = new SysRole();
+        sysRole.setCompanyId(id);
+        sysRole.setRoleName(company);
+        sysRole.setRoleKey(company);
+        sysRole.setRoleSort(defaultOrder);
+        sysRole.setDataScope(dataScope);
+        sysRole.setMenuCheckStrictly(isCheck);
+        sysRole.setDeptCheckStrictly(isCheck);
+        sysRole.setStatus(status);
+        sysRole.setIsAuto(isAuto);
+        ownCompanyService.insertRole(sysRole);
+        List<SysRole> roleList= roleService.selectRoleList(sysRole);
+        //角色id
+        Long roleId = roleList.get(0).getRoleId();
+        Long[] roleIds = new Long[1];
+        roleIds[0] = roleId;
         // 创建用户
         SysUser sysUser = new SysUser();
         sysUser.setUserName(phone);
         sysUser.setNickName(username);
         sysUser.setPassword(SecurityUtils.encryptPassword(password));
         sysUser.setCompanyId(id);
+        sysUser.setRoleIds(roleIds);
         userService.insertUser(sysUser);
         sysUser = userService.selectUserByUserName(phone);
         //创建企业用户关联
@@ -1048,7 +1107,7 @@ public class SysUserController extends BaseController
         userCompanyRel.setSucrUserId(sysUser.getUserId());
         userCompanyRel.setSucrCompanyId(id);
         userCompanyRel.setSucrHandler("0");
-        userCompanyRel.setSucrDeptId(sysUser.getDeptId());
+        userCompanyRel.setSucrDeptId(deptId);
         userCompanyRel.setCreateTime(DateUtils.getNowDate());
         userCompanyRel.setCreateBy(CommonUtil.objToString(sysUser.getUserId()));
         userCompanyRelService.createSysUserCompanyRel(userCompanyRel);