Merge remote-tracking branch 'origin/master'

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -420,10 +420,8 @@ END) as projectScale*/
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id and pfp.del_flag = 0
 		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
 		LEFT JOIN sys_user sua on a.create_by = sua.id
-		<if test="leaderNameStr !=null and leaderNameStr !=''">
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
-		</if>
 		LEFT JOIN sys_user sub on a.project_master_id = sub.id
 		LEFT JOIN sys_office sob ON sob.id = sub.office_id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
@@ -786,10 +784,8 @@ END) as projectScale*/
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id and pfp.del_flag = 0
 		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
 		LEFT JOIN sys_user sua on a.create_by = sua.id
-		<if test="leaderNameStr !=null and leaderNameStr !=''">
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
-		</if>
 		LEFT JOIN sys_user sub on a.project_master_id = sub.id
 		LEFT JOIN sys_office sob ON sob.id = sub.office_id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
@@ -1052,10 +1048,8 @@ END) as projectScale*/
 		FROM rural_project_records a
 		left join case_base cb on a.id = cb.project_id
 
-		<if test="leaderNameStr !=null and leaderNameStr !=''">
-			LEFT JOIN work_project_user w on a.id = w.project_id
-			LEFT JOIN sys_user su on w.user_id = su.id
-		</if>
+		LEFT JOIN work_project_user w on a.id = w.project_id
+		LEFT JOIN sys_user su on w.user_id = su.id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		<if test="workContractInfo !=null">
 			LEFT JOIN work_contract_info wci on a.contract_id = wci.id
@@ -1690,10 +1684,8 @@ END) as projectScale*/
 		SELECT ROUND(sum(if(prd.status = '5',prd.ZiXunShouRu,0)),2) as moneyAll
 		FROM rural_project_records a
 
-		<if test="leaderNameStr !=null and leaderNameStr !=''">
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
-		</if>
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		<if test="workContractInfo !=null">
 			LEFT JOIN work_contract_info wci on a.contract_id = wci.id