分页查询码活动未关联的码包列表(新增修改页面) sql异常解决

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListActivePackageAddReq.java

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -169,12 +169,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bb.parent_brand_name,
         qp.qr_number,
         ba.active_name,
-        (CASE WHEN act.active_name = null or act.active_name = '' THEN '0' ELSE '1' END) AS is_join_active
+        (CASE WHEN ba.active_name = null or ba.active_name = '' THEN '0' ELSE '1' END) AS is_join_active
         from qr_package qp
         inner join base_material bm on bm.id=qp.material_id
         inner join base_sku bs on bs.id=bm.sku_id
-        inner join base_brand bb on bb.id=bs.sub_brand_code
-        left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=p.id
+        inner join base_brand bb on bb.brand_code=bs.sub_brand_code
+        left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
         left join base_active ba on ba.id = baqpm.active_id
         where
         bb.brand_code IN(