From fce8e677dd4f4b7b34c01f481c17d19fcf4465cb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 19 Aug 2022 17:00:14 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsGroupController.java |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsGroupController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsGroupController.java
index 58c984f..be5607b 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsGroupController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsGroupController.java
@@ -1,5 +1,6 @@
 package com.xcong.farmer.cms.modules.system.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xcong.farmer.cms.common.response.Result;
@@ -55,28 +56,21 @@
     @ApiOperation(value = "添加分组", notes = "添加分组")
     @PostMapping(value = "/add")
     public Result add(@RequestBody @Valid AddGroupInfoDto addGroupInfoDto) {
-        UserEntity user = LoginUserUtil.getLoginUser();
-        CmsGroupInfoEntity groupInfo = CmsGroupInfoConversion.INSTANCE.addDtoToEntity(addGroupInfoDto);
-        groupInfo.setCreateBy(user.getNickname());
-        groupInfo.setUpdateBy(user.getNickname());
-        cmsGroupInfoService.save(groupInfo);
+        cmsGroupInfoService.add(addGroupInfoDto);
         return Result.ok("添加成功");
     }
 
     @ApiOperation(value = "修改分组", notes = "修改分组")
     @PostMapping(value = "/modify")
     public Result modify(@RequestBody @Valid ModifyGroupInfoDto modifyGroupInfoDto) {
-        UserEntity user = LoginUserUtil.getLoginUser();
-        CmsGroupInfoEntity groupInfo = CmsGroupInfoConversion.INSTANCE.modifyDtoToEntity(modifyGroupInfoDto);
-        groupInfo.setCreateBy(user.getNickname());
-        groupInfo.setUpdateBy(user.getNickname());
-        cmsGroupInfoService.updateById(groupInfo);
+        cmsGroupInfoService.modify(modifyGroupInfoDto);
         return Result.ok("修改成功");
     }
 
     @ApiOperation(value = "删除")
     @PostMapping(value = "/delete")
     public Result delete(@RequestBody @Valid GroupDeleteDto groupDeleteDto) {
-        return null;
+        cmsGroupInfoService.removeByIds(StrUtil.split(groupDeleteDto.getIds(), ','));
+        return Result.ok("删除成功");
     }
 }

--
Gitblit v1.9.1