|  | @@ -67,6 +67,8 @@ import javax.servlet.http.HttpServletRequest;
 | 
												
													
														
															|  |  public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao, WorkStaffBasicInfo> {
 |  |  public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao, WorkStaffBasicInfo> {
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |      @Autowired
 |  |      @Autowired
 | 
												
													
														
															|  | 
 |  | +    private  RoleService roleService;
 | 
												
													
														
															|  | 
 |  | +    @Autowired
 | 
												
													
														
															|  |      private WorkStaffAchievementService achievementService;
 |  |      private WorkStaffAchievementService achievementService;
 | 
												
													
														
															|  |      @Autowired
 |  |      @Autowired
 | 
												
													
														
															|  |      private WorkStaffCertificateService certificateService;
 |  |      private WorkStaffCertificateService certificateService;
 | 
												
											
												
													
														
															|  | @@ -168,12 +170,16 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 | 
												
													
														
															|  |          User user = new User();
 |  |          User user = new User();
 | 
												
													
														
															|  |          user.setId(workStaffBasicInfo.getUserId());
 |  |          user.setId(workStaffBasicInfo.getUserId());
 | 
												
													
														
															|  |          user.setName(workStaffBasicInfo.getName());
 |  |          user.setName(workStaffBasicInfo.getName());
 | 
												
													
														
															|  | -        userService.updateUserName(user);
 |  | 
 | 
												
													
														
															|  | -        if(workStaffBasicInfo.getRoleId() != null){
 |  | 
 | 
												
													
														
															|  | -	        userService.updateRole(workStaffBasicInfo);
 |  | 
 | 
												
													
														
															|  | -        }else{
 |  | 
 | 
												
													
														
															|  | 
 |  | +        if (userService.get(user.getId())!=null){
 | 
												
													
														
															|  | 
 |  | +            userService.updateUserName(user);
 | 
												
													
														
															|  | 
 |  | +        }
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  | 
 |  | +        if(roleService.getRoleIdByUserId(user.getId())==null){
 | 
												
													
														
															|  |              userService.insertRole(workStaffBasicInfo);
 |  |              userService.insertRole(workStaffBasicInfo);
 | 
												
													
														
															|  | 
 |  | +        }else{
 | 
												
													
														
															|  | 
 |  | +            userService.updateRole(workStaffBasicInfo);
 | 
												
													
														
															|  |          }
 |  |          }
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  |  	}
 |  |  	}
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |      public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
 |  |      public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
 |