feat: 一些调整
This commit is contained in:
parent
0965ba1b2d
commit
b7f4aff07d
|
|
@ -203,11 +203,12 @@ public class UserController extends ControllerBase {
|
||||||
public ApiResult<Void> changeUserEnable(@Valid @RequestBody EnableRequest request){
|
public ApiResult<Void> changeUserEnable(@Valid @RequestBody EnableRequest request){
|
||||||
if (request.getEnable()){
|
if (request.getEnable()){
|
||||||
AppUserApplyfor applyfor=appUserApplyforService.addEnable(request);
|
AppUserApplyfor applyfor=appUserApplyforService.addEnable(request);
|
||||||
|
AppUser user=appUserService.getById(request.getId());
|
||||||
List<AdminUser> adminUsers=adminUserService.getForAccountReview();
|
List<AdminUser> adminUsers=adminUserService.getForAccountReview();
|
||||||
if (CollectionUtil.isNotEmpty(adminUsers)){
|
if (CollectionUtil.isNotEmpty(adminUsers)){
|
||||||
adminUsers.forEach(c -> adminMessageService.add(
|
adminUsers.forEach(c -> adminMessageService.add(
|
||||||
new AdminMessage()
|
new AdminMessage()
|
||||||
.setNo(applyfor.getUserEmail())
|
.setNo(user.getEmail())
|
||||||
.setUserId(c.getId())
|
.setUserId(c.getId())
|
||||||
.setSourceId(applyfor.getId())
|
.setSourceId(applyfor.getId())
|
||||||
.setSource(1)
|
.setSource(1)
|
||||||
|
|
|
||||||
|
|
@ -127,8 +127,12 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
|
||||||
AppUser appUser;
|
AppUser appUser;
|
||||||
if (Objects.nonNull(applyfor.getUserId())) {
|
if (Objects.nonNull(applyfor.getUserId())) {
|
||||||
appUser = appUserService.getById(applyfor.getUserId());
|
appUser = appUserService.getById(applyfor.getUserId());
|
||||||
|
if (Objects.isNull(applyfor.getAreaId())) {
|
||||||
applyfor.setAreaId(appUser.getAreaId());
|
applyfor.setAreaId(appUser.getAreaId());
|
||||||
|
}
|
||||||
|
if (Objects.isNull(applyfor.getTitleId())) {
|
||||||
applyfor.setTitleId(appUser.getTitleId());
|
applyfor.setTitleId(appUser.getTitleId());
|
||||||
|
}
|
||||||
List<TBaseCustomer> customers =customerService.listByIds(Arrays.stream(appUser.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()));
|
List<TBaseCustomer> customers =customerService.listByIds(Arrays.stream(appUser.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()));
|
||||||
applyforInfo
|
applyforInfo
|
||||||
.setCompanyName(StrUtil.join(",",customers.stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList())))
|
.setCompanyName(StrUtil.join(",",customers.stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList())))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue