From 1abd27fc6e7d8e0202fbb3fe35db00add079ab29 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 十二月 2023 15:24:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master
---
zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
index 2c489b2..054566f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
@@ -2,12 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.entity.UserLogin;
import com.zy.asrs.common.sys.service.UserLoginService;
import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.service.ManTagService;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.controller.AbstractBaseController;
@@ -33,6 +34,8 @@
private UserService userService;
@Autowired
private UserLoginService userLoginService;
+ @Autowired
+ private ManTagService manTagService;
protected Long getHostId(){
if (getUserId() == 9527) {
@@ -118,4 +121,8 @@
return page;
}
+ protected ManTag getOriginTag(){
+ return manTagService.getTop();
+ }
+
}
--
Gitblit v1.9.1