guoyujia 10 meses atrás
pai
commit
4d7e0f50ff

+ 7 - 0
src/main/java/cn/ezhizao/project/system/controller/SysLoginController.java

@@ -7,6 +7,8 @@ import cn.ezhizao.framework.security.service.SysLoginService;
 import cn.ezhizao.framework.security.service.SysPermissionService;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.takeStockPeriod.domain.BizTakeStockPeriod;
+import cn.ezhizao.project.business.takeStockPeriod.service.IBizTakeStockPeriodService;
 import cn.ezhizao.project.system.domain.SysMenu;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysMenuService;
@@ -37,6 +39,8 @@ public class SysLoginController extends BaseController
 
     @Resource
     private SysPermissionService permissionService;
+    @Resource
+    private IBizTakeStockPeriodService bizTakeStockPeriodService;
 
     /**
      * 登录方法
@@ -60,6 +64,9 @@ public class SysLoginController extends BaseController
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         user.setPermissions(permissions);
+        //当前是否处于盘点状态
+        List<BizTakeStockPeriod> takeStockList = bizTakeStockPeriodService.query().eq("status", 1).list();
+        user.setTakeStock(takeStockList.size() > 0 ? true : false);
         return AjaxResult.success(user);
     }
     /**

+ 11 - 0
src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import cn.ezhizao.common.xss.Xss;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
@@ -368,4 +369,14 @@ public class SysUser extends BaseEntity {
     public void setPermissions(Set<String> permissions) {
         this.permissions = permissions;
     }
+    @TableField(exist = false)
+    private Boolean isTakeStock;
+
+    public Boolean getTakeStock() {
+        return isTakeStock;
+    }
+
+    public void setTakeStock(Boolean takeStock) {
+        isTakeStock = takeStock;
+    }
 }