Merge remote-tracking branch 'origin/pet' into pet
						commit
						db6b3e8ea7
					
				|  | @ -173,7 +173,7 @@ | ||||||
| 		left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR | 		left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR | ||||||
| 		left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR | 		left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR | ||||||
| 		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID | 		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID | ||||||
| 		left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on  o.OUTSOURCED_ID = k.OUTSOURCED_ID | 		left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on  (o.OUTSOURCED_ID = k.OUTSOURCED_ID OR o.OUTSOURCED_ID = f.KEYPROJECTCHECK_ID) | ||||||
| 		left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID | 		left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID | ||||||
| 		where f.ISDELETE = '0' | 		where f.ISDELETE = '0' | ||||||
| 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> | 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue