Merge remote-tracking branch 'origin/master'

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

@@ -342,7 +342,9 @@ public class TEmployeeContractInfoController {
 	@SysLog("批量导出合同审核")
 	@PostMapping("/exportAuditContractInfo")
 	@PreAuthorize("@pms.hasPermission('employee_export_contract_audit')")
-	public void exportAuditContractInfo(@RequestBody(required = false) TEmployeeContractSearchVo contractInfo, HttpServletResponse response) {
+	public void exportAuditContractInfo(@RequestBody(required = false) TEmployeeContractSearchVo contractInfo,
+										@RequestParam(required = false,name = "mId") String mId,
+										HttpServletResponse response) {
 		if (Common.isEmpty(contractInfo)){
 			contractInfo = new TEmployeeContractSearchVo();
 		}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -94,6 +94,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		try{
 			for(String userId : userIdList){
 				redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_VOS_BY_USERID +"_"+userId);
+				redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_NOS_BY_USERID +"_"+userId);
 			}
 		} catch (Exception e) {
 			log.error("清除缓存错误：",e);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -344,7 +344,11 @@ public class TDispatchInfoController {
 	@Operation(description = "导出派单审核记录 hasPermission('tdispatchinfo-export')")
 	@PostMapping("/auditExport")
 	@PreAuthorize("@pms.hasPermission('tdispatchinfo-export')")
-	public void auditExport(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo) {
+	public void auditExport(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo,
+							@RequestParam(required = false,name = "mId") String mId) {
+		searchVo.setDeleteFlag(CommonConstants.ZERO_STRING);
+		searchVo.setStatus(CommonConstants.ONE_STRING);
+		searchVo.setMId(mId);
 		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, searchVo);
 		if (Common.isNotNull(searchVo.getAuthSql())) {