diff --git a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java index 81b963a..aa3b11c 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java +++ b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java @@ -3,6 +3,7 @@ package com.fate.firm.controller; import com.fate.common.datasource.annotation.Master; import com.fate.common.core.domain.Result; import com.fate.common.core.web.controller.BaseController; +import com.fate.common.security.utils.SecurityUtils; import com.fate.firm.domain.Firm; import com.fate.firm.domain.request.FirmRequest; import com.fate.firm.service.FirmService; @@ -133,5 +134,11 @@ public class FirmController extends BaseController { return result; } + @GetMapping("/xshen") + private Result xshen(){ + Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoleId(); + return Result.success(roleId); + } + } diff --git a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java index 26568fb..f071b03 100644 --- a/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java +++ b/fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java @@ -44,7 +44,6 @@ public class FirmServiceImpl extends ServiceImpl implements Fi **/ @Override public Result addFirm(Firm firm) { - firm.setFirmId(null); firm.setCreateBy("1"); firm.setCreateTime(new Date()); firm.setUpdateBy(null); @@ -86,6 +85,7 @@ public class FirmServiceImpl extends ServiceImpl implements Fi if (StringUtils.isNotEmpty(firm.getFirmHead())) { queryWrapper.like(Firm::getFirmHead, firm.getFirmHead()); } + // 逻辑删除 不显示状态为2的 queryWrapper.eq(Firm::getFirmStaus,1); List list = firmMapper.selectList(queryWrapper); return list; @@ -123,8 +123,7 @@ public class FirmServiceImpl extends ServiceImpl implements Fi @Override public Result manage(Firm firm) { Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoleId(); - - return null; + return Result.success(roleId); }