fate
/
fate-modules-firm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交测试返回的数据

master
sikadi 2023-11-24 18:50:29 +08:00
parent 9ab1b91c71
commit 4e834a4500
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
View File

@ -3,6 +3,7 @@ package com.fate.firm.controller;
import com.fate.common.datasource.annotation.Master; import com.fate.common.datasource.annotation.Master;
import com.fate.common.core.domain.Result; import com.fate.common.core.domain.Result;
import com.fate.common.core.web.controller.BaseController; 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.Firm;
import com.fate.firm.domain.request.FirmRequest; import com.fate.firm.domain.request.FirmRequest;
import com.fate.firm.service.FirmService; import com.fate.firm.service.FirmService;
@ -133,5 +134,11 @@ public class FirmController extends BaseController {
return result; return result;
} }
@GetMapping("/xshen")
private Result xshen(){
Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoleId();
return Result.success(roleId);
}
} }

5
fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java
View File

@ -44,7 +44,6 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
**/ **/
@Override @Override
public Result addFirm(Firm firm) { public Result addFirm(Firm firm) {
firm.setFirmId(null);
firm.setCreateBy("1"); firm.setCreateBy("1");
firm.setCreateTime(new Date()); firm.setCreateTime(new Date());
firm.setUpdateBy(null); firm.setUpdateBy(null);
@ -86,6 +85,7 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
if (StringUtils.isNotEmpty(firm.getFirmHead())) { if (StringUtils.isNotEmpty(firm.getFirmHead())) {
queryWrapper.like(Firm::getFirmHead, firm.getFirmHead()); queryWrapper.like(Firm::getFirmHead, firm.getFirmHead());
} }
// 逻辑删除 不显示状态为2的
queryWrapper.eq(Firm::getFirmStaus,1); queryWrapper.eq(Firm::getFirmStaus,1);
List<Firm> list = firmMapper.selectList(queryWrapper); List<Firm> list = firmMapper.selectList(queryWrapper);
return list; return list;
@ -123,8 +123,7 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
@Override @Override
public Result manage(Firm firm) { public Result manage(Firm firm) {
Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoleId(); Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoleId();
return Result.success(roleId);
return null;
} }