Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -80,7 +80,7 @@
         LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id and pclr.lift_id = plr.lift_id
         LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id and plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-		WHERE 1=1
+		WHERE 1=1 AND plr.delete_flag = '0'
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
 			AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>
@@ -116,13 +116,14 @@
           pclr.lift_company_status  AS liftStatus,
           plr.project_id            AS projectId,
           plr.worker_id             AS workerId,
+		  plr.lift_locked           AS liftLocked,
 		  ui.name                   AS workerName
         FROM project_lift_relevance plr
           LEFT JOIN lift l ON plr.lift_id = l.id
           LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
 		  LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
           LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
-        WHERE 1=1
+        WHERE 1=1 AND plr.delete_flag = '0'
 		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
 			AND plr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		</if>
@@ -152,6 +153,7 @@
 		WHERE 1=1
 		AND pclr.lift_company_status != '1'
 		AND l.lift_status = '2'
+        AND plr.delete_flag = '0'
 		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
 			AND plr.mt_company_id != #{request.mtCompanyId,jdbcType=BIGINT}
 		</if>