zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修复网关配置错误

Browse Source 
2. 修复生成器 docker,controller 生成器错误
3. 修复 e 办人员同步错误处理
This commit is contained in:
chenbowen
2025-09-11 17:17:45 +08:00
parent 28db8e3cc3
commit 45e2562111
6 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/user/UserCreateRequestVO.java
View File

@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.system.controller.admin.sync.vo.user;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -9,11 +8,29 @@ import lombok.Data;
*/
@Schema(description = "对外接口账号创建请求 VO")
@Data
public class UserCreateRequestVO extends AdminUserDO {
public class UserCreateRequestVO {
@Schema(description = "用户名", required = true)
private String bimRemoteUser;
@Schema(description = "密码", required = true)
private String bimRemotePwd;
@Schema(description = "请求ID", required = true)
private String bimRequestId;
@Schema(description = "用户归属部门(多个为逗号分割)", required = true)
private String deptIds;
@Schema(description = "用户名")
private String username;
@Schema(description = "密码")
private String password;
@Schema(description = "昵称")
private String nickname;
@Schema(description = "注释")
private String remark;
@Schema(description = "邮箱")
private String email;
@Schema(description = "电话")
private String mobile;
@Schema(description = "性别")
private Integer sex;
@Schema(description = "状态")
private Integer status;
}

9
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImpl.java
View File

@@ -1,8 +1,9 @@
package cn.iocoder.yudao.module.system.service.sync;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.system.controller.admin.sync.vo.user.*;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
@@ -20,6 +21,7 @@ import java.beans.PropertyDescriptor;
import java.util.*;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
@Service
public class UserSyncServiceImpl implements UserSyncService {
@@ -39,6 +41,11 @@ public class UserSyncServiceImpl implements UserSyncService {
if (requestVO.getSex() != null) {
saveReqVO.setSex(SyncVerifyUtil.convertExternalToInternal(requestVO.getSex()));
}
LoginUser loginUser = getLoginUser();
Long tenantId = Optional.ofNullable(loginUser).orElse(new LoginUser()).getTenantId();
TenantContextHolder.setTenantId(tenantId);
// 中铝 e 办不会设置密码，设置默认密码
saveReqVO.setPassword("ZLEB");
Long userId = adminUserService.createUser(saveReqVO);
UserCreateResponseVO resp = new UserCreateResponseVO();
resp.setUid(String.valueOf(userId));