diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index d850fedb..a6313e44 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -20,7 +20,7 @@ spring: file-extension: yml shared-configs: - config-common.yml - - config-port.yml +# - config-port.yml - config-mq.yml - config-log.yml - config-sdk-server.yml @@ -38,3 +38,5 @@ spring: namespace: ${spring.cloud.nacos.config.namespace} inetutils: preferred-networks: 192.168.10.28 +server: + port: 8081 \ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java index d3df2cd6..f286ecfe 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java @@ -117,7 +117,7 @@ public class AppUserController { } @ApiOperation("app获取用户在职企业-轮询") @PostMapping("/getUserCorpByPhone") - public SingleResponse getUserCorpByPhone(@Validated @RequestBody UserAppLoginCmd cmd) { + public SingleResponse getUserCorpByPhone(@Validated @RequestBody UserAppPhoneCmd cmd) { return SingleResponse.of(userService.getUserCorpByPhone(cmd)); } @ApiOperation("app获取用户在职企业") diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java index 83677c23..6500dd23 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java @@ -37,10 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -80,6 +77,32 @@ public class UserImportExe { if (roleCOMultiResponse == null || CollUtil.isEmpty(roleCOMultiResponse.getData())) { throw new BizException("未创建角色,请联系管理员"); } + // + Boolean b = corpInfoRepository.isSupper(); + Long roleId = null; + List roleCOList = roleCOMultiResponse.getData(); + if(b){ + //是 + Optional superCorpRoleOpt = roleCOList.stream() + .filter(roleCO -> roleCO.getRoleName().contains("股份端普通用户")) + .findFirst(); + if (superCorpRoleOpt.isPresent()) { + roleId = superCorpRoleOpt.get().getId(); + } + }else{ + // 普通租户查找普通用户或个人账号 + Optional normalRoleOpt = roleCOList.stream() + .filter(roleCO -> roleCO.getRoleName().contains("普通用户") || + roleCO.getRoleName().contains("个人账户")) + .findFirst(); + if (normalRoleOpt.isPresent()) { + roleId = normalRoleOpt.get().getId(); + } + } + if(roleId == null){ + throw new BizException("未创建角色,请联系管理员"); + } + // 部门数据 List departmentDOList = departmentRepository.listByCorpInfoId(corpinfoId); List departmentDOTempList = new ArrayList<>(); @@ -102,7 +125,7 @@ public class UserImportExe { // 开始处理导入逻辑 for (UserExcelImportEntity importEntity : list) { try { - processSingleUser(importEntity, corpFlag, corpinfoId, corpInfoDO, departmentDOList, departmentDOTempList, postDOList, userDOList, userDOTempList, roleCOMultiResponse.getData()); + processSingleUser(importEntity, corpFlag, corpinfoId, corpInfoDO, departmentDOList, departmentDOTempList, postDOList, userDOList, userDOTempList, roleId); } catch (Exception e) { if(CollUtil.isNotEmpty(departmentDOTempList)){ // 删除底座创建的部门 @@ -131,7 +154,7 @@ public class UserImportExe { List postDOList, List userDOList, List userDOTempList, - List roleList) { + Long roleId) { // 1. 处理部门层级,获取最终部门ID Long departmentId = processDepartmentHierarchy(importEntity, corpinfoId, departmentDOList, departmentDOTempList); @@ -140,7 +163,7 @@ public class UserImportExe { Long postId = processPost(importEntity, corpinfoId, corpInfoDO, departmentId, postDOList); // 3. 处理角色信息 - Long roleId = processRoleInfo(importEntity, roleList); +// Long roleId = processRoleInfo(importEntity, roleList); // 4. 处理用户信息 processUserInfo(importEntity, corpFlag, corpinfoId, corpInfoDO, departmentId, postId, userDOList, userDOTempList, roleId); @@ -346,20 +369,20 @@ public class UserImportExe { * 处理角色信息 */ private Long processRoleInfo(UserExcelImportEntity importEntity, List roleList) { - if(StringUtils.isBlank(importEntity.getRoleName())){ - throw new BizException("角色名称不能为空"); - } - try { - Map roleCOMap = roleList.stream().collect(Collectors.toMap(RoleCO::getRoleName, role -> role)); - String roleName = importEntity.getRoleName(); - if(roleCOMap.get(roleName) == null){ - throw new BizException("角色不存在: " + roleName); - } - return roleCOMap.get(roleName).getId(); - }catch (IllegalStateException e){ - throw new BizException("系统角色名称重复,请联系管理员"); - } - +// if(StringUtils.isBlank(importEntity.getRoleName())){ +// throw new BizException("角色名称不能为空"); +// } +// try { +// Map roleCOMap = roleList.stream().collect(Collectors.toMap(RoleCO::getRoleName, role -> role)); +// String roleName = importEntity.getRoleName(); +// if(roleCOMap.get(roleName) == null){ +// throw new BizException("角色不存在: " + roleName); +// } +// return roleCOMap.get(roleName).getId(); +// }catch (IllegalStateException e){ +// throw new BizException("系统角色名称重复,请联系管理员"); +// } + return null; } /** diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 3f740502..90b7ab97 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -267,7 +267,7 @@ public class UserQueryExe { userLoginCO.setUserCO(userCoConvertor.converDOToCO(userDO)); return userLoginCO; } - public UserLoginCO getUserCorpByPhone(UserAppLoginCmd cmd) { + public UserLoginCO getUserCorpByPhone(UserAppPhoneCmd cmd) { UserLoginCO userLoginCO = new UserLoginCO(); //返回企业列表 //根据手机号获取用户列表 diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index ca125b62..0a113e2a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -214,7 +214,7 @@ public class UserServiceImpl implements UserServiceI { } @Override - public UserLoginCO getUserCorpByPhone(UserAppLoginCmd cmd) { + public UserLoginCO getUserCorpByPhone(UserAppPhoneCmd cmd) { return userQueryExe.getUserCorpByPhone(cmd); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index b5c25f3d..6c75f88c 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -91,6 +91,6 @@ public interface UserServiceI { List getUserList(); - UserLoginCO getUserCorpByPhone(UserAppLoginCmd cmd); + UserLoginCO getUserCorpByPhone(UserAppPhoneCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppPhoneCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppPhoneCmd.java new file mode 100644 index 00000000..f9ad43da --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppPhoneCmd.java @@ -0,0 +1,24 @@ +package com.zcloud.basic.info.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-04 14:07:36 + */ +@Data +public class UserAppPhoneCmd { + + @ApiModelProperty(value = "手机号", name = "phone", required = true) + @NotEmpty(message = "手机号不能为空") + private String phone; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java index a71cdf2e..6f78aa11 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java @@ -41,5 +41,6 @@ public interface CorpInfoRepository extends BaseRepository { List getByIdList(List corpinfoIds); + Boolean isSupper(); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index eec5c3c8..9d751c0f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -268,5 +268,16 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl