修改报告审核可以看到自己新建的试验bug
This commit is contained in:
@@ -99,7 +99,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
// @PermissionData(pageComponent="experiment/manage/ExperimentList")
|
// @PermissionData(pageComponent="experiment/manage/ExperimentList")
|
||||||
public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,@RequestParam(name = "pageName", defaultValue = "") String pageName,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
//Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
//Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
||||||
// 自定义duoXuan字段的查询规则为:LIKE_WITH_OR
|
// 自定义duoXuan字段的查询规则为:LIKE_WITH_OR
|
||||||
@@ -114,6 +114,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
experiment.setSampleType(StringUtils.remove(experiment.getSampleType(), "*"));
|
experiment.setSampleType(StringUtils.remove(experiment.getSampleType(), "*"));
|
||||||
experiment.setSampleModel(StringUtils.remove(experiment.getSampleModel(), "*"));
|
experiment.setSampleModel(StringUtils.remove(experiment.getSampleModel(), "*"));
|
||||||
experiment.setEquipmentModel(StringUtils.remove(experiment.getEquipmentModel(), "*"));
|
experiment.setEquipmentModel(StringUtils.remove(experiment.getEquipmentModel(), "*"));
|
||||||
|
experiment.setPageName(pageName);
|
||||||
|
|
||||||
String username = JwtUtil.getUserNameByToken(req);
|
String username = JwtUtil.getUserNameByToken(req);
|
||||||
SysUser currentUser = userService.getUserByName(username);
|
SysUser currentUser = userService.getUserByName(username);
|
||||||
|
|||||||
Reference in New Issue
Block a user