|
@@ -6,8 +6,6 @@ import cn.iaun.it.util.MyPage;
|
|
|
import cn.iaun.it.util.Result;
|
|
import cn.iaun.it.util.Result;
|
|
|
import cn.iaun.it.util.ResultCode;
|
|
import cn.iaun.it.util.ResultCode;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import org.slf4j.Logger;
|
|
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
@@ -15,7 +13,6 @@ import javax.validation.constraints.NotNull;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/resource")
|
|
@RequestMapping("/resource")
|
|
@@ -93,6 +90,10 @@ public class ItResourceController {
|
|
|
public Result<?> delItResourceGroup(@PathVariable String i) {
|
|
public Result<?> delItResourceGroup(@PathVariable String i) {
|
|
|
long id = Long.parseLong(i);
|
|
long id = Long.parseLong(i);
|
|
|
int result = itResourceService.delResourceGroup(id);
|
|
int result = itResourceService.delResourceGroup(id);
|
|
|
|
|
+ // 删除分组对应的所有属性值
|
|
|
|
|
+ if (result == 1) {
|
|
|
|
|
+ itResourceService.deleteAttributeByGroupId(id);
|
|
|
|
|
+ }
|
|
|
return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
|
|
return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED, null);
|
|
|
}
|
|
}
|
|
|
|
|
|