Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-09-28 38cf88aad29f2ab98564311472b7e2bfda59cd39

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.sanshuo.ComMediateTypeDTO;
import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoEventDTO;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComMediateType;
import com.panzhihua.service_community.entity.ComSanshuoEvent;
@@ -46,8 +47,10 @@

    @GetMapping("/appletsList")
    public R appletList(){
        return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1)));
        return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1).eq("delete_flag", 0)));
    }



    /**
     * 新增事件类型
@@ -78,4 +81,5 @@
        comMediateType.setModifyUser(this.getLoginUserInfo().getUserId());
        return R.ok(commediateTypeService.updateById(comMediateType));
    }

}