From fc74b76c35e7f1ab3ea96c676ebaae3b06c6d0b0 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 2 Feb 2023 15:30:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=20=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=20202?= =?UTF-8?q?3=E5=B9=B41=E6=9C=8829=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gaotao/common/exception/XJException.java | 6 +++--- .../resources/mapper/shopOrder/ProductionReportMapper.xml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gaotao/common/exception/XJException.java b/src/main/java/com/gaotao/common/exception/XJException.java index 1e5c1eb..79350a6 100644 --- a/src/main/java/com/gaotao/common/exception/XJException.java +++ b/src/main/java/com/gaotao/common/exception/XJException.java @@ -3,11 +3,11 @@ package com.gaotao.common.exception; import com.gaotao.common.constant.SysMsgConstant; +import com.gaotao.common.utils.SpringContextUtils; import com.gaotao.modules.sys.dao.SysMsgDao; import com.gaotao.modules.sys.entity.SysUserEntity; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; /** * 自定义异常 @@ -20,8 +20,8 @@ public class XJException extends RuntimeException { return (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); } - @Autowired - private SysMsgDao sysMsgDao; + + private SysMsgDao sysMsgDao = (SysMsgDao)SpringContextUtils.getBean("sysMsgDao"); private String msg; private int code = 500; diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index 10241ff..c99056d 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -56,7 +56,8 @@ P.GroupID,dbo.Get_PartGroupDesc(P.Site,P.GroupID) as GroupName from SORouting as T,ShopOrder as D,WorkCenter as W,Part as P - AND T.Site=D.Site and T.OrderNo=D.OrderNo and T.Site=W.Site and T.WorkCenterNo=W.WorkCenterNo and D.Site=P.Site and D.PartNo=P.PartNo and T.OrderNo='8888' and T.site in (Select Site from AccessSite where upper(UserID)=#{user}) + + AND T.Site=D.Site and T.OrderNo=D.OrderNo and T.Site=W.Site and T.WorkCenterNo=W.WorkCenterNo and D.Site=P.Site and D.PartNo=P.PartNo and T.site in (Select Site from AccessSite where upper(UserID)=#{user}) AND T.Site = #{site}