Merge branch 'develop_tzs' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_tzs

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -261,12 +261,12 @@
         ct.qrCode,
         ct.electronic_label_code
         FROM
-        tz_cylinder_inspection AS isp
-        LEFT JOIN tz_cylinder_info AS ci ON ci.sequence_code = isp.sequence_code
+        tz_cylinder_info AS  ci
+        LEFT JOIN tz_cylinder_inspection  AS isp  ON ci.sequence_code = isp.sequence_code
         LEFT JOIN cb_data_dictionary AS d1 ON d1.type = 'CZJZMC' AND d1.code = ci.filling_media
         LEFT JOIN cb_data_dictionary AS d2 ON d2.sequence_nbr = ci.cylinder_variety
         LEFT JOIN cb_data_dictionary AS d3 ON d3.sequence_nbr = ci.cylinder_status
-        LEFT JOIN tz_cylinder_tags AS ct ON ct.sequence_code = ci.sequence_code
+        LEFT JOIN tz_cylinder_tags AS ct ON ct.sequence_code = ci.sequence_code and  ci.app_id = ct.app_id
         WHERE isp.next_inspection_date <![CDATA[ < ]]> now()
         <if test="appids != null and appids.size > 0 ">
             and ci.app_id in

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/controller/CylinderInfoController.java

@@ -513,6 +513,10 @@ public class CylinderInfoController extends BaseController {
 				appids.add("-1");
 			}
 			cylinderInfoDto.setAppIds(appids);
+		}else {
+			if (!ObjectUtils.isEmpty(cylinderInfoDto.getAppId())){
+				appids.add(cylinderInfoDto.getAppId());
+			}
 		}