|
@@ -311,7 +311,9 @@ public class NewPlatformApi {
|
|
String realName = userBypassAccount.getRealName();
|
|
String realName = userBypassAccount.getRealName();
|
|
UserBypassAccount userBypassAccount1 = userBypassAccountService.getById(userBypassAccount.getId());
|
|
UserBypassAccount userBypassAccount1 = userBypassAccountService.getById(userBypassAccount.getId());
|
|
|
|
|
|
|
|
+ userBypassAccount1.setDepartmentId(userBypassAccount.getDepartmentId());
|
|
userBypassAccount1.setDepartment(department);
|
|
userBypassAccount1.setDepartment(department);
|
|
|
|
+ userBypassAccount1.setOrganizationDepartmentUserId(userBypassAccount.getOrganizationDepartmentUserId());
|
|
userBypassAccount1.setRealName(realName);
|
|
userBypassAccount1.setRealName(realName);
|
|
userBypassAccountService.updateById(userBypassAccount1);
|
|
userBypassAccountService.updateById(userBypassAccount1);
|
|
return CommonResult.success("修改子账号信息成功");
|
|
return CommonResult.success("修改子账号信息成功");
|
|
@@ -690,7 +692,7 @@ public class NewPlatformApi {
|
|
) {
|
|
) {
|
|
ArrayList<OrganizationDepartmentUser> organizationDepartmentUsers = new ArrayList<>();
|
|
ArrayList<OrganizationDepartmentUser> organizationDepartmentUsers = new ArrayList<>();
|
|
LambdaQueryWrapper<OrganizationDepartment> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<OrganizationDepartment> queryWrapper = new LambdaQueryWrapper<>();
|
|
- queryWrapper.eq(OrganizationDepartment::getName, id);
|
|
|
|
|
|
+ queryWrapper.eq(OrganizationDepartment::getId, id);
|
|
queryWrapper.eq(OrganizationDepartment::getOrganizationId, organizationId);
|
|
queryWrapper.eq(OrganizationDepartment::getOrganizationId, organizationId);
|
|
List<OrganizationDepartment> list = organizationDepartmentService.list(queryWrapper);
|
|
List<OrganizationDepartment> list = organizationDepartmentService.list(queryWrapper);
|
|
for (OrganizationDepartment organizationDepartment : list) {
|
|
for (OrganizationDepartment organizationDepartment : list) {
|
|
@@ -785,15 +787,6 @@ public class NewPlatformApi {
|
|
@ApiOperation(value = "企业账号编辑")
|
|
@ApiOperation(value = "企业账号编辑")
|
|
@RequestMapping(value = "/enterpriseEdit", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/enterpriseEdit", method = RequestMethod.POST)
|
|
public CommonResult<UserEnterprise> organizationEdit(@RequestBody @Validated UserEnterprise request) {
|
|
public CommonResult<UserEnterprise> organizationEdit(@RequestBody @Validated UserEnterprise request) {
|
|
- LambdaQueryWrapper<OrganizationDepartment> departmentLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
- departmentLambdaQueryWrapper.eq(OrganizationDepartment::getOrganizationId,request.getOrganizationId());
|
|
|
|
- departmentLambdaQueryWrapper.eq(OrganizationDepartment::getName,request.getDepartment());
|
|
|
|
- List<OrganizationDepartment> list = organizationDepartmentService.list(departmentLambdaQueryWrapper);
|
|
|
|
- if (null!=list &&list.size()>0){
|
|
|
|
- for (OrganizationDepartment organizationDepartment : list) {
|
|
|
|
- request.setDepartId(organizationDepartment.getId());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
userEnterpriseService.updateById(request);
|
|
userEnterpriseService.updateById(request);
|
|
return CommonResult.success("操作成功");
|
|
return CommonResult.success("操作成功");
|
|
}
|
|
}
|