委托备注

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

@@ -737,6 +737,7 @@
 		<result property="fundCity" column="FUND_CITY"/>
 		<result property="fundTown" column="FUND_TOWN"/>
 		<result property="belongUnit" column="BELONG_UNIT_NAME"/>
+		<result property="fundTrustRemark" column="TRUST_REMARK"/>
 
 	</resultMap>
 	<!--tDispatchInfo 社保花名册数据查询-->
@@ -785,7 +786,7 @@
 		s.UNIT_BIGAILMENT_CARDINAL,
 		s.UNIT_BIGAILMENT_MONEY,
 		s.PERSONAL_BIGAILMENT_MONEY,
-		s.TRUST_REMARK socailTrustRemark,
+		s.TRUST_REMARK,
 		a.REDUCE_REASON
 		<include refid="where_getSocialRecordRoster"/>
 	</select>
@@ -844,7 +845,8 @@
 		f.PERSONAL_PROVIDENT_FEE,
 		f.FUND_PROVINCE,
 		f.FUND_CITY,
-		f.FUND_TOWN
+		f.FUND_TOWN,
+		f.TRUST_REMARK
 		<include refid="where_getFundRecord"/>
 	</select>
 
@@ -868,7 +870,7 @@
 		</if>
 		left join t_social_info s on a.SOCIAL_ID = s.id
 		<where>
-			1=1 and s.DELETE_FLAG = 0
+			s.DELETE_FLAG = 0
 			<if test="idsStr != null and idsStr.size > 0">
 				AND a.ID in
 				<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
@@ -982,7 +984,7 @@
 		</if>
 		left join t_provident_fund f on a.FUND_ID = f.id
 		<where>
-			1=1 and a.DELETE_FLAG = 0
+			a.DELETE_FLAG = 0
 			<if test="idsStr != null and idsStr.size > 0">
 				AND a.ID in
 				<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">