Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/mapper/annualinspection/AnnualInspectionMapper.xml

@@ -308,7 +308,7 @@
                       LEFT JOIN platform_company_lift_relevance pc
                                 ON ai.lift_id = pc.lift_id AND pc.lift_company_status !=1 AND ai.mt_company_id = pc.mt_company_id
              <if test="request.currentRoleCode == 'REGION_DIRECTOR' or request.currentRoleCode == 'CLERK' or request.currentRoleCode == 'ROLEMTWORK' ">
-                 LEFT JOIN project_lift_relevance plr ON plr.mt_company_id = pc.mt_company_id AND plr.lift_id = ai.lift_id AND plr.delete_flag = '0'
+                 LEFT JOIN project_lift_relevance plr ON plr.mt_company_id = ai.mt_company_id AND plr.lift_id = ai.lift_id AND plr.delete_flag = '0'
              </if>
              <if test="request.currentRoleCode == 'REGION_DIRECTOR' or request.currentRoleCode == 'CLERK' ">
                  LEFT JOIN project_user pu ON plr.project_id = pu.project_id AND pu.mt_company_id = plr.mt_company_id

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -81,6 +81,7 @@ public class MaintenanceOptionController {
         if (options.isEmpty()) {
             return RestResponse.success();
         }
+        options.forEach(o -> o.setStatus(0));
         return RestResponse.success(options);
     }