|
@@ -1,5 +1,6 @@
|
|
|
package com.fjhx.dingding.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
import cn.hutool.extra.pinyin.PinyinUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -17,8 +18,11 @@ import com.fjhx.tenant.entity.tenant.po.TenantInfo;
|
|
|
import com.fjhx.tenant.service.tenant.impl.TenantInfoServiceImpl;
|
|
|
import com.ruoyi.common.constant.StatusConstant;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
+import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
+import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
+import com.ruoyi.system.service.ISysUserService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -50,6 +54,9 @@ public class DingServiceImpl implements DingService {
|
|
|
@Autowired
|
|
|
private ISysDeptService sysDeptService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService sysUserService;
|
|
|
+
|
|
|
/**
|
|
|
* https://open.dingtalk.com/document/isvapp/data-formats
|
|
|
*/
|
|
@@ -189,8 +196,22 @@ public class DingServiceImpl implements DingService {
|
|
|
ArrayList<SysDept> deptList = new ArrayList<>();
|
|
|
addDeptList(corpid, deptList, tenantId, 1L, 0L);
|
|
|
|
|
|
+ // 创建用户
|
|
|
+ SysUser sysUser = new SysUser();
|
|
|
+ // sysUser.setDeptId(sysDept.getDeptId());
|
|
|
+ sysUser.setTenantId(tenantId);
|
|
|
+ sysUser.setUserName("admin");
|
|
|
+ sysUser.setNickName(corpName + "管理员");
|
|
|
+ sysUser.setPassword(SecurityUtils.encryptPassword(RandomUtil.randomString(6)));
|
|
|
+ sysUser.setStatus("0");
|
|
|
+ sysUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
+ sysUser.setCreateTime(new Date());
|
|
|
+ sysUser.setDdUserId(bizData.getJSONObject("auth_user_info").getString("userId"));
|
|
|
+ sysUserService.save(sysUser);
|
|
|
+
|
|
|
log.info("钉钉回调创建租户,tenantInfo:{}", JSON.toJSONString(tenantInfo));
|
|
|
log.info("钉钉回调创建部门,deptList:{}", JSON.toJSONString(deptList));
|
|
|
+ log.info("钉钉回调创建用户,sysUser:{}", JSON.toJSONString(sysUser));
|
|
|
|
|
|
TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
|
|
|
try {
|
|
@@ -217,7 +238,7 @@ public class DingServiceImpl implements DingService {
|
|
|
|
|
|
List<OapiV2DepartmentListsubResponse.DeptBaseResponse> tempDeptList = DingUtil.getDeptList(corpid, dingParentId);
|
|
|
|
|
|
- if (tempDeptList.size() == 0) {
|
|
|
+ if (ObjectUtil.isEmpty(tempDeptList)) {
|
|
|
return;
|
|
|
}
|
|
|
|