Merge remote-tracking branch 'origin/master'

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

@@ -1846,7 +1846,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 						}
 					}
 					// 判断空值
-					this.judgeNull(errorMsg, saveEmp);
+					//this.judgeNull(errorMsg, saveEmp);
 
 					// 更新时，不需要更新其余信息
 					newOld = new EmployeeNewOldVO();

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -542,9 +542,6 @@
                a.SOCIAL_HOUSEHOLD_NAME,
                a.PROVIDENT_HOUSEHOLD_NAME
         FROM t_dispatch_info a
-		<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
-			left join t_socialfund_house_res p on p.USER_ID = #{tDispatchInfo.createBy}
-		</if>
         <where>
             1=1
             <include refid="tDispatchInfo_where"/>
@@ -865,9 +862,6 @@
 	</select>
 	<sql id="where_getSocialRecordRoster">
 		FROM t_dispatch_info a
-		<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
-			left join t_socialfund_house_res p on p.USER_ID = #{tDispatchInfo.createBy}
-		</if>
 		left join t_social_info s on a.SOCIAL_ID = s.id
 		<where>
 			s.DELETE_FLAG = 0
@@ -979,9 +973,6 @@
 
 	<sql id="where_getFundRecord">
 		FROM t_dispatch_info a
-		<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
-			left join t_socialfund_house_res p on p.USER_ID = #{tDispatchInfo.createBy}
-		</if>
 		left join t_provident_fund f on a.FUND_ID = f.id
 		<where>
 			a.DELETE_FLAG = 0