From 38cf88aad29f2ab98564311472b7e2bfda59cd39 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 13:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 12 ++++++++----
1 files changed, 8 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..bb4be05 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,15 +47,17 @@
@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)));
}
+
+
/**
* 新增事件类型
* */
@PostMapping
public R add(@RequestBody ComMediateTypeDTO comMediateTypeDTO){
- //comMediateTypeDTO.setCreateUser(this.getLoginUserInfo().getUserId());
+ comMediateTypeDTO.setCreateUser(this.getLoginUserInfo().getUserId());
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
@@ -63,7 +66,7 @@
* */
@PutMapping
public R update(@RequestBody ComMediateTypeDTO comMediateTypeDTO){
- //comMediateTypeDTO.setModifyUser(this.getLoginUserInfo().getUserId());
+ comMediateTypeDTO.setModifyUser(this.getLoginUserInfo().getUserId());
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
@@ -75,7 +78,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