|
@@ -490,6 +490,7 @@ END) as projectScale*/
|
|
|
LEFT JOIN sys_user sua on a.create_by = sua.id
|
|
|
LEFT JOIN work_project_user w1 on a.id = w1.project_id
|
|
|
LEFT JOIN sys_user su on w1.user_id = su.id
|
|
|
+ LEFT JOIN sys_user suMaster on a.project_master_id = suMaster.id
|
|
|
LEFT JOIN work_contract_info wci on a.contract_id = wci.id
|
|
|
LEFT JOIN work_client_info wct on wci.client_id = wct.id
|
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
@@ -548,6 +549,9 @@ END) as projectScale*/
|
|
|
<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
|
|
|
AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
|
|
|
</if>
|
|
|
+ <if test="(projectMasterName != null and projectMasterName != '') or (projectMasterId != null and projectMasterId != '')">
|
|
|
+ AND ((a.project_master_id = #{projectMasterId}) or suMaster.name like concat('%',#{projectMasterName},'%')) AND suMaster.del_flag='0'
|
|
|
+ </if>
|
|
|
<if test="projectStatus !=null">
|
|
|
AND a.status = #{projectStatus}
|
|
|
</if>
|
|
@@ -957,6 +961,7 @@ END) as projectScale*/
|
|
|
LEFT JOIN sys_user sua on a.create_by = sua.id
|
|
|
LEFT JOIN work_project_user w1 on a.id = w1.project_id
|
|
|
LEFT JOIN sys_user su on w1.user_id = su.id
|
|
|
+ LEFT JOIN sys_user suMaster on a.project_master_id = suMaster.id
|
|
|
LEFT JOIN work_contract_info wci on a.contract_id = wci.id
|
|
|
LEFT JOIN work_client_info wct on wci.client_id = wct.id
|
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
@@ -1015,6 +1020,9 @@ END) as projectScale*/
|
|
|
<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
|
|
|
AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
|
|
|
</if>
|
|
|
+ <if test="(projectMasterName != null and projectMasterName != '') or (projectMasterId != null and projectMasterId != '')">
|
|
|
+ AND ((a.project_master_id = #{projectMasterId}) or suMaster.name like concat('%',#{projectMasterName},'%')) AND suMaster.del_flag='0'
|
|
|
+ </if>
|
|
|
<if test="projectStatus !=null">
|
|
|
AND a.status = #{projectStatus}
|
|
|
</if>
|
|
@@ -1360,6 +1368,7 @@ END) as projectScale*/
|
|
|
LEFT JOIN sys_user sua on a.create_by = sua.id
|
|
|
LEFT JOIN work_project_user w1 on a.id = w1.project_id
|
|
|
LEFT JOIN sys_user su on w1.user_id = su.id
|
|
|
+ LEFT JOIN sys_user suMaster on a.project_master_id = suMaster.id
|
|
|
LEFT JOIN work_contract_info wci on a.contract_id = wci.id
|
|
|
LEFT JOIN work_client_info wct on wci.client_id = wct.id
|
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
@@ -1418,6 +1427,9 @@ END) as projectScale*/
|
|
|
<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
|
|
|
AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
|
|
|
</if>
|
|
|
+ <if test="(projectMasterName != null and projectMasterName != '') or (projectMasterId != null and projectMasterId != '')">
|
|
|
+ AND ((a.project_master_id = #{projectMasterId}) or suMaster.name like concat('%',#{projectMasterName},'%')) AND suMaster.del_flag='0'
|
|
|
+ </if>
|
|
|
<if test="projectStatus !=null">
|
|
|
AND a.status = #{projectStatus}
|
|
|
</if>
|