1. 职级调整，同步修改basicinfo的职级

2. 部门调转，同步修改basicinfo的部门和职级

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -848,7 +848,7 @@ public class UserController extends BaseController {
             if("home".equals(request.getParameter("home"))){
 //                model.addAttribute("message", "修改密码成功,请重新登录");
 //                SecurityUtils.getSubject().logout();
-                return  "modules/sys/sysHome";
+                return  "redirect:/a/home";
             }
             return "modules/sys/userInfo";
         }

src/main/java/com/jeeplus/modules/workchangejob/service/WorkChangeJobService.java

@@ -153,14 +153,18 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 						workChangeJobUserDao.insert(workChangeJobUser);
 					}
 				} else {
-					if(StringUtils.isNotBlank(workChangeJobUser.getBasicInfoId())){
-					workChangeJobUser.preUpdate();
-					workChangeJobUser.setOfficeId(workChangeJob.getOfficeId());
-					workChangeJobUser.setChangeId(workChangeJob.getId());
-					workChangeJobUser.setCompanyId(workChangeJob.getCompanyId());
-					workChangeJobUserDao.update(workChangeJobUser);
-				}
+					if (StringUtils.isNotBlank(workChangeJobUser.getBasicInfoId())) {
+						workChangeJobUser.preUpdate();
+						workChangeJobUser.setOfficeId(workChangeJob.getOfficeId());
+						workChangeJobUser.setChangeId(workChangeJob.getId());
+						workChangeJobUser.setCompanyId(workChangeJob.getCompanyId());
+						workChangeJobUserDao.update(workChangeJobUser);
+					}
 				}
+				//更新work_staff_basic_info表的职级
+				String after_jobGrade = workChangeJobUser.getAfter();
+				String userId = workChangeJobUser.getUserId();
+				workStaffBasicInfoDao.updateJobGradeByUserId(userId, after_jobGrade);
 			}
 		}
 	}

src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -155,15 +155,16 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 	 */
 	@Transactional(readOnly = false)
 	public void updateWorkOfficeChangeList(WorkOfficeChange workOfficeChange) {
-		if(workOfficeChange.getWorkOfficeChangeUserList()!=null&&workOfficeChange.getWorkOfficeChangeUserList().size()>0){
-			for (WorkOfficeChangeUser workOfficeChangeUser :workOfficeChange.getWorkOfficeChangeUserList()) {
-				if (StringUtils.isBlank(workOfficeChangeUser.getId()) ) {
-					if(StringUtils.isNotBlank(workOfficeChangeUser.getBasicInfoId())){
+		String jobGradeId = workOfficeChange.getChangeOffice();
+		if (workOfficeChange.getWorkOfficeChangeUserList() != null && workOfficeChange.getWorkOfficeChangeUserList().size() > 0) {
+			for (WorkOfficeChangeUser workOfficeChangeUser : workOfficeChange.getWorkOfficeChangeUserList()) {
+				if (StringUtils.isBlank(workOfficeChangeUser.getId())) {
+					if (StringUtils.isNotBlank(workOfficeChangeUser.getBasicInfoId())) {
 						workOfficeChangeUser.preInsert();
 						workOfficeChangeUser.setChangeId(workOfficeChange.getId());
 						workOfficeChangeUser.setOfficeId(workOfficeChange.getOfficeId());
-						User user=userDao.get(workOfficeChangeUser.getUserId());
-						if(user!=null){
+						User user = userDao.get(workOfficeChangeUser.getUserId());
+						if (user != null) {
 							workOfficeChangeUser.setOldOfficeId(user.getOffice().getId());
 							workOfficeChangeUser.setOldOfficeName(user.getOffice().getName());
 						}
@@ -171,18 +172,24 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 						workOfficeChangeUserDao.insert(workOfficeChangeUser);
 					}
 				} else {
-					if(StringUtils.isNotBlank(workOfficeChangeUser.getBasicInfoId())){
-					workOfficeChangeUser.preUpdate();
-					workOfficeChangeUser.setOfficeId(workOfficeChange.getOfficeId());
-					workOfficeChangeUser.setChangeId(workOfficeChange.getId());
-                        User user=userDao.get(workOfficeChangeUser.getUserId());
-                        if(user!=null){
-                            workOfficeChangeUser.setOldOfficeId(user.getOffice().getId());
-                            workOfficeChangeUser.setOldOfficeName(user.getOffice().getName());
-                        }
-					workOfficeChangeUser.setCompanyId(workOfficeChange.getCompanyId());
-					workOfficeChangeUserDao.update(workOfficeChangeUser);
+					if (StringUtils.isNotBlank(workOfficeChangeUser.getBasicInfoId())) {
+						workOfficeChangeUser.preUpdate();
+						workOfficeChangeUser.setOfficeId(workOfficeChange.getOfficeId());
+						workOfficeChangeUser.setChangeId(workOfficeChange.getId());
+						User user = userDao.get(workOfficeChangeUser.getUserId());
+						if (user != null) {
+							workOfficeChangeUser.setOldOfficeId(user.getOffice().getId());
+							workOfficeChangeUser.setOldOfficeName(user.getOffice().getName());
+						}
+						workOfficeChangeUser.setCompanyId(workOfficeChange.getCompanyId());
+						workOfficeChangeUserDao.update(workOfficeChangeUser);
+					}
 				}
+				String userId = workOfficeChangeUser.getUserId();
+				workStaffBasicInfoDao.updateJobGradeByUserId(userId,jobGradeId);
+				String officeId = workOfficeChangeUser.getOldOfficeId();
+				if(officeId!=null){
+					workStaffBasicInfoDao.updateOfficeByUserId(userId,officeId);
 				}
 			}
 		}

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workstaff.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -53,4 +54,20 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
     int updateWorkStaffBasicInfo(WorkStaffBasicInfo workStaffBasicInfo);
 
     WorkStaffBasicInfo getByAchieveId(String achieveId);
+
+    /**
+     * 更新员工职级
+     * @param userId
+     * @param jobGradeId
+     * @return
+     */
+    int updateJobGradeByUserId(@Param("userId") String userId,@Param("jobGradeId") String jobGradeId);
+
+    /**
+     * 更新员工所属部门
+     * @param userId
+     * @param officeId
+     * @return
+     */
+    int updateOfficeByUserId(@Param("userId") String userId,@Param("officeId") String officeId);
 }

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -544,4 +544,15 @@
 		on w.user_id = a.user_id
 		where a.id = #{achieveId}
 	</select>
+
+	<update id="updateJobGradeByUserId">
+		update work_staff_basic_info
+		set job_grade = #{jobGradeId}
+		where user_id = #{userId}
+	</update>
+	<update id="updateOfficeByUserId">
+		update work_staff_basic_info
+		set office_id = #{officeId}
+		where user_id = #{userId}
+	</update>
 </mapper>