Bläddra i källkod

修复Bug,更新档案不会再重复插入了。

user4 5 år sedan
förälder
incheckning
2bbc8f28e9

+ 5 - 5
src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -538,12 +538,12 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
-		workStaffBasicInfo.setIsNewRecord(false);
-		WorkStaffBasicInfo t = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
-		MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-		workStaffBasicInfoService.updateAchieveDirectly(workStaffBasicInfo,request);
+		WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
+        String staffId = basicInfo.getId();
+        MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, basicInfo);//将编辑表单中的非NULL值覆盖数据库记录中的值
+        basicInfo.setId(staffId);
+		workStaffBasicInfoService.updateAchieveDirectly(basicInfo,request);
 		addMessage(redirectAttributes, "保存员工档案信息成功");
-
 		return "redirect:"+Global.getAdminPath()+"/sys/user/info?repage";
 	}
 

+ 0 - 2
src/main/resources/mappings/modules/workstaff/WorkStaffAchivesDao.xml

@@ -772,8 +772,6 @@
 		FROM work_staff_achives a
 		<include refid="workStaffBasicInfoJoins"/>
 		WHERE a.user_id = #{userId} and a.company_id=#{company.id} and a.status not in ('离职','退休')
-		order by a.create_date desc
-		limit 1
 	</select>
 	<select id="getJob" resultType="WorkStaffBasicInfo" >
 		SELECT