diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index 16578dd..17383ec 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -137,7 +137,10 @@ public class CmsAppUserController extends BaseController public AjaxResult editRegisterUser(@RequestBody RegisterBody registerBody) { if (registerBody == null) { - throw new IllegalArgumentException("入参registerBody不能为空"); + return AjaxResult.error("入参registerBody不能为空!"); + } + if(registerBody.getAppUser()==null){ + return AjaxResult.error("用户信息为空!"); } return AjaxResult.success(appUserService.editRegisterUser(registerBody)); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index cb1524c..1e425a4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import com.ruoyi.cms.service.IAppUserService; +import org.springframework.transaction.annotation.Transactional; /** * APP用户Service业务层处理 @@ -272,17 +273,21 @@ public class AppUserServiceImpl extends ServiceImpl imple } @Override + @Transactional(rollbackFor = Exception.class) public int editRegisterUser(RegisterBody registerBody) { - //保存或修改工作经历 - List userWorkExperiencesList=registerBody.getExperiencesList(); - editUserWorkExperiences(userWorkExperiencesList); - //修改技能 - List skillList=registerBody.getAppSkillsList(); - editSkill(skillList); - //修改用户信息 - AppUser appUser=registerBody.getAppUser(); - if(appUser!=null&&appUser.getUserId()!=null){ - appUserMapper.updateById(appUser); + Long userId=registerBody.getAppUser().getUserId(); + if(userId!=null){ + //保存或修改工作经历 + List userWorkExperiencesList=registerBody.getExperiencesList(); + editUserWorkExperiences(userWorkExperiencesList,userId); + //修改技能 + List skillList=registerBody.getAppSkillsList(); + editSkill(skillList,userId); + //修改用户信息 + AppUser appUser=registerBody.getAppUser(); + if(appUser!=null&&appUser.getUserId()!=null){ + appUserMapper.updateById(appUser); + } } return 1; } @@ -291,10 +296,11 @@ public class AppUserServiceImpl extends ServiceImpl imple * 修改技能 * @param list */ - public void editSkill(List list){ + public void editSkill(List list,Long userId){ if(list!=null&&list.size()>0){ List add=new ArrayList<>(); list.forEach(it->{ + it.setUserId(userId); if(it.getId()!=null){appSkillMapper.updateById(it);}else{add.add(it);} }); if(add.size()>0){ @@ -307,10 +313,11 @@ public class AppUserServiceImpl extends ServiceImpl imple * 修改工作经历 * @param list */ - public void editUserWorkExperiences(List list){ + public void editUserWorkExperiences(List list,Long userId){ if(list!=null&&list.size()>0){ List add=new ArrayList<>(); list.forEach(it->{ + it.setUserId(userId); if(it.getId()!=null){userWorkExperiencesMapper.updateById(it);}else{add.add(it);} }); if(add.size()>0){