From 9ef6c6c5aa5a5efb6f26ad67bc31320a9ccbe3f8 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 10:18:06 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
index 95c5daa..5a446bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
+++ b/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,7 +47,7 @@
@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)));
}
/**
@@ -54,7 +55,7 @@
* */
@PostMapping
public R add(@RequestBody ComMediateTypeDTO comMediateTypeDTO){
- //comMediateTypeDTO.setCreateUser(this.getLoginUserInfo().getUserId());
+ comMediateTypeDTO.setCreateUser(this.getLoginUserInfo().getUserId());
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
@@ -63,7 +64,7 @@
* */
@PutMapping
public R update(@RequestBody ComMediateTypeDTO comMediateTypeDTO){
- //comMediateTypeDTO.setModifyUser(this.getLoginUserInfo().getUserId());
+ comMediateTypeDTO.setModifyUser(this.getLoginUserInfo().getUserId());
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
@@ -75,7 +76,8 @@
ComMediateType comMediateType = commediateTypeService.getById(id);
comMediateType.setDeleteFlag(true);
comMediateType.setEnabled(false);
- //comMediateType.setModifyUser(this.getLoginUserInfo().getUserId());
+ comMediateType.setModifyUser(this.getLoginUserInfo().getUserId());
return R.ok(commediateTypeService.updateById(comMediateType));
}
+
}
--
Gitblit v1.7.1