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

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java

@@ -208,7 +208,6 @@ public class ArchivesDaprUtil {
 	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type){
 		if (Common.isEmpty(empIdCard)
 				|| Common.isEmpty(projectNo)
-				|| Common.isEmpty(contractId)
 				|| Common.isEmpty(type)){
 			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 		}

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpInsuranceUtil.java

@@ -209,7 +209,7 @@ public class EkpInsuranceUtil {
 			}
 			//结算月
 			if(null != param.getSettleMonth()){
-				pushParam.setFd_3aea2f0180eccc(param.getSettleMonth());
+				pushParam.setFd_3aea2f0180eccc(dateStringInsert(param.getSettleMonth()));
 			}else{
 				pushParam.setFd_3aea2f0180eccc(CommonConstants.EMPTY_STRING);
 			}
@@ -235,5 +235,14 @@ public class EkpInsuranceUtil {
 			}
 		return pushParam;
 	}
+
+	public static String dateStringInsert(String month) {
+		if (month.length() == 6) {
+			StringBuilder sb = new StringBuilder(month);
+			sb.insert(4, "-");
+			return sb.toString();
+		}
+		return month;
 	}
+}
 

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

@@ -185,9 +185,15 @@ public class TDispatchInfoController {
 		tDispatchInfo.setStatus(CommonConstants.ONE_STRING);
 		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, tDispatchInfo);
-		if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+		if (Common.isNotNull(tDispatchInfo.getAuthSql())) {
+			if (tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 			}
+			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			}
+		}
 		tDispatchInfo.setCreateBy(user.getId());
 		return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
 	}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -1178,10 +1178,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		info.setWorkingHoursAdd(CommonConstants.TWO_STRING);
 
 		SysHouseHoldInfo sysHouseHoldInfo = sysHouseHoldInfoMapper.selectOne(Wrappers.<SysHouseHoldInfo>query().lambda()
-				.eq(SysHouseHoldInfo::getName, socialHouse).eq(SysHouseHoldInfo::getType, CommonConstants.ZERO_STRING));
+				.eq(SysHouseHoldInfo::getName, socialHouse).eq(SysHouseHoldInfo::getType, CommonConstants.ZERO_STRING)
+				.eq(SysHouseHoldInfo::getDelFlag, CommonConstants.ZERO_STRING));
 		info.setSocialHouseAdd(sysHouseHoldInfo.getId());
 		SysHouseHoldInfo sysHouseHoldFund = sysHouseHoldInfoMapper.selectOne(Wrappers.<SysHouseHoldInfo>query().lambda()
-				.eq(SysHouseHoldInfo::getName, fundHouse).eq(SysHouseHoldInfo::getType, CommonConstants.ONE_STRING));
+				.eq(SysHouseHoldInfo::getName, fundHouse).eq(SysHouseHoldInfo::getType, CommonConstants.ONE_STRING)
+				.eq(SysHouseHoldInfo::getDelFlag, CommonConstants.ZERO_STRING));
 		if (Common.isNotNull(sysHouseHoldFund)) {
 			info.setFundHouseAdd(sysHouseHoldFund.getId());
 		}