Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpBadRecordController.java

@@ -140,7 +140,7 @@ public class TEmpBadRecordController {
 	@SysLog("通过ids删除员工不良记录" )
 	@DeleteMapping("/removeByIds" )
 	@PreAuthorize("@pms.hasPermission('demo_tempbadrecord_del_batch')" )
-	public R<Boolean> removeByIds(@RequestParam String ids) {
+	public R<Boolean> removeByIds(@RequestBody(required = true)  String ids) {
 		List<String> idList = Common.getList(ids);
 		return R.ok(tEmpBadRecordService.removeByIds(idList));
 	}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java

@@ -138,7 +138,7 @@ public class TEmpDisabilityInfoController {
 	@SysLog("通过ids删除员工伤残信息表" )
 	@DeleteMapping("/removeByIds" )
 	@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_del_batch')" )
-	public R<Boolean> removeByIds(@RequestParam String ids) {
+	public R<Boolean> removeByIds(@RequestBody(required = true)  String ids) {
 		List<String> idList = Common.getList(ids);
 		return R.ok(tEmpDisabilityInfoService.removeByIds(idList));
 	}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpEducationController.java

@@ -136,7 +136,7 @@ public class TEmpEducationController {
 	@SysLog("通过id删除员工学历信息表" )
 	@DeleteMapping("/removeByIds" )
 	@PreAuthorize("@pms.hasPermission('archives_education_del_batch')" )
-	public R<Boolean> removeByIds(String ids) {
+	public R<Boolean> removeByIds(@RequestBody(required = true) String ids) {
 		List<String> idList = null;
 		if (Common.isNotNull(ids)){
 			idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java

@@ -146,28 +146,11 @@ public class TEmpFamilyController {
 	@SysLog("通过id删除员工家庭信息表" )
 	@DeleteMapping("/removeByIds" )
 	@PreAuthorize("@pms.hasPermission('archives-family-batch-delete')" )
-	public R<Boolean> removeByIds(String ids) {
+	public R<Boolean> removeByIds(@RequestBody(required = true) String ids) {
 		List<String> idList = Common.getList(ids);
 		return tEmpFamilyService.removeByIdsDiy(idList);
 	}
 
-
-/*	*//**
-	 * 批量新增员工家庭信息
-	 *
-	 * @param excelVOList
-	 * @return
-	 * @Author fxj
-	 * @Date 2019-08-16
-	 **/
-/*	@Operation(description = "批量新增员工家庭信息 hasPermission('archives-family-batch-import')")
-	@SysLog("批量新增员工家庭信息")
-	@PostMapping("/importListAdd")
-	@PreAuthorize("@pms.hasPermission('archives-family-batch-import')")
-	public R<List<ErrorMessage>> importListAdd(@RequestExcel List<EmpFamilyExcelVO> excelVOList, BindingResult bindingResult) {
-		return tEmpFamilyService.importEmpFamily(excelVOList, bindingResult);
-	}*/
-
 	/**
 	 * 批量新增员工家庭信息
 	 *

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpProfessionalQualificationController.java

@@ -135,7 +135,7 @@ public class TEmpProfessionalQualificationController {
 	@SysLog("通过ids删除员工职业资格信息表" )
 	@DeleteMapping("/removeByIds" )
 	@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_del_batch')" )
-	public R removeByIds(@RequestParam String ids) {
+	public R removeByIds(@RequestBody(required = true) String ids) {
 		List<String> idList = Common.getList(ids);
 		return R.ok(qualificationService.removeByIds(idList));
 	}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpWorkRecordingController.java

@@ -136,7 +136,7 @@ public class TEmpWorkRecordingController {
 	@SysLog("通过id删除员工家工作息表" )
 	@DeleteMapping("/removeByIds" )
 	@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del_batch')" )
-	public R<Boolean> removeByIds(String ids) {
+	public R<Boolean> removeByIds(@RequestBody(required = true) String ids) {
 		List<String> idList = Common.getList(ids);
 		return R.ok(tEmpWorkRecordingService.removeByIds(idList));
 	}