fix 广告

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ActivityAdvertisingLocationQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,7 +45,7 @@ public class ActivityAdvertisingLocationQueryBo extends BaseEntity {
 	private Integer intervalTime;
 	/** 0关闭 1启动 -1删除 */
 	@ApiModelProperty("0关闭 1启动 -1删除")
-	private Integer status;
+	private List<Integer> status;
 	/** 键名 */
 	@ApiModelProperty("键名")
 	private String locationKey;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ActivityAdvertisingLocationServiceImpl.java

@@ -41,7 +41,7 @@ public class ActivityAdvertisingLocationServiceImpl extends ServiceImpl<Activity
         LambdaQueryWrapper<ActivityAdvertisingLocation> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getName()), ActivityAdvertisingLocation::getName, bo.getName());
         lqw.eq(bo.getIntervalTime() != null, ActivityAdvertisingLocation::getIntervalTime, bo.getIntervalTime());
-        lqw.eq(bo.getStatus() != null, ActivityAdvertisingLocation::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, ActivityAdvertisingLocation::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getLocationKey()), ActivityAdvertisingLocation::getLocationKey, bo.getLocationKey());
         return entity2Vo(this.list(lqw));
     }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				LEFT JOIN course_subject cs2 ON qb2.subject_id = cs2.id
 		WHERE
 			ga.goods_id = #{goodsId}
-
+		order by ga.sort desc
     </select>
 
 	<select id="selectDoList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">