From 1560ee2ecb34c2ec0d6759016017730ee27f6954 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 3 Jan 2024 10:19:51 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=8E=B7=E5=8F=96=E8=BF=94?= =?UTF-8?q?=E4=BF=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysLoginController.java | 13 +++++++++++++ .../resources/mapper/report/BoardReportMapper.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java index d1da84e..f753337 100644 --- a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java +++ b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java @@ -2,6 +2,8 @@ package com.aucma.web.controller.system; import java.util.List; import java.util.Set; + +import com.aucma.system.service.ISysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -34,6 +36,9 @@ public class SysLoginController @Autowired private SysPermissionService permissionService; + @Autowired + private ISysPostService postService; + /** * 登录方法 * @@ -72,6 +77,14 @@ public class SysLoginController ajax.put("companyName", "澳柯玛股份有限公司"); ajax.put("factoryCode", "1301"); ajax.put("factoryName", "河南民权工厂"); + List postList = postService.selectPostListByUserId(user.getUserId()); + if (postList.contains(9L)){ + //超级返修措施权限 + ajax.put("userPermission", 2); + }else { + //普通返修措施权限 + ajax.put("userPermission", 1); + } return ajax; } diff --git a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml index d368fec..e5688fe 100644 --- a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml @@ -19,7 +19,7 @@ boi.SALEORDER_CODE, boi.MATERIAL_CODE, boi.MATERIAL_NAME, - TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') PLAN_CODE, + TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') PLAN_DATE, CASE WHEN TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD') THEN 0 ELSE 1 END STATUS,