修改1为true、0为false

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/DlUserServiceImpl.java

@@ -46,6 +46,7 @@ public class DlUserServiceImpl implements DlUserService {
                     .or()
                     .apply("start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
             });
+        queryWrapper.eq("deleted","0");
         List<DlUser> dlUsers = dlUserMapper.selectList(queryWrapper);
         List<DlUserListVo> vos = new ArrayList<>();
         for (DlUser user : dlUsers){

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/GoodsServiceImpl.java

@@ -33,6 +33,7 @@ public class GoodsServiceImpl implements GoodsService {
         goodsQueryWrapper.eq("appkey",goods.getAppkey());
         goodsQueryWrapper.eq("goods_id",goods.getGoodsId());
         goodsQueryWrapper.eq("vendor_id",goods.getVendorId());
+        goodsQueryWrapper.eq("deleted","0");
         Goods one = goodsMapper.selectOne(goodsQueryWrapper);
         if (one != null)
             return 2;
@@ -69,6 +70,7 @@ public class GoodsServiceImpl implements GoodsService {
             queryWrapper.apply("create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
             queryWrapper.apply("create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+        queryWrapper.eq("deleted","0");
         List<GoodsListVo> vos = new ArrayList<>();
         for (Goods goods : goodsMapper.selectList(queryWrapper)) {
             vos.add(new GoodsListVo(goods));
@@ -82,6 +84,7 @@ public class GoodsServiceImpl implements GoodsService {
         goodsQueryWrapper.eq("appkey",bo.getAppkey());
         goodsQueryWrapper.eq("goods_id",bo.getGoodsId());
         goodsQueryWrapper.eq("vendor_id",bo.getVendorId());
+        goodsQueryWrapper.eq("deleted","0");
         Goods goods = goodsMapper.selectOne(goodsQueryWrapper);
         return new GoodsDetailVo(goods);
     }
@@ -92,6 +95,7 @@ public class GoodsServiceImpl implements GoodsService {
         goodsQueryWrapper.eq("appkey",goods.getAppkey());
         goodsQueryWrapper.eq("goods_id",goods.getGoodsId());
         goodsQueryWrapper.eq("vendor_id",goods.getVendorId());
+        goodsQueryWrapper.eq("deleted","0");
         return goodsMapper.update(goods,goodsQueryWrapper);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/OrderServiceImpl.java

@@ -38,7 +38,7 @@ public class OrderServiceImpl implements OrderService {
     public String getSign(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
@@ -68,7 +68,7 @@ public class OrderServiceImpl implements OrderService {
     public int addOrder(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -62,7 +62,7 @@ public class PlanServiceImpl implements PlanService {
     public String getSign(PlanAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
@@ -89,7 +89,7 @@ public class PlanServiceImpl implements PlanService {
     public int addPlan(PlanAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
@@ -161,10 +161,15 @@ public class PlanServiceImpl implements PlanService {
         Plan plan = planMapper.selectOne(planQueryWrapper);
         if (plan == null)
             return -1;
+        // 没有该app或者该app已经被禁用，则不允许审核
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",plan.getAppkey());
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
+        if (app == null)
+            return -1;
+
         plan.setState(bo.getState());
         int i = planMapper.updateById(plan);
         if (i == 0)
@@ -495,6 +500,7 @@ public class PlanServiceImpl implements PlanService {
     public PageInfo<List<Equipment>> getEquipments(PlanBo bo) {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
+        equipmentQueryWrapper.eq("state",1);
         if (bo.getText() != null)
             equipmentQueryWrapper.and(equipmentQueryWrapper1 -> {
                 equipmentQueryWrapper1.like("equipment_id",bo.getText())

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StatisticsServiceImpl.java

@@ -64,7 +64,7 @@ public class StatisticsServiceImpl implements StatisticsService {
     public String getSign(StatisticsAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
@@ -89,7 +89,7 @@ public class StatisticsServiceImpl implements StatisticsService {
     public int add(StatisticsAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("state",1);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/OnStateUtil.java

@@ -2,11 +2,11 @@ package com.ruoyi.demo.utils;
 
 public class OnStateUtil {
     // 上架
-    public static int UP = 0;
+    public static int UP = 1;
     public static String UP_CHAR = "上架";
 
     // 下架
-    public static int DOWN = 1;
+    public static int DOWN = 0;
     public static String DOWN_CHAR = "下架";
 
     public static String getOnStateChar(int onState){