From 0326e66b5405380967e3abcf4c04429a2b7f9b2f Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 12 Aug 2021 09:13:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=AF=E5=8A=A8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
index 03b737c2..2f4b9196 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
@@ -405,7 +405,7 @@
     </select>
 
     <!-- 查询SAR_STAND_ITEMS列表 -->
-    <select id="queryByPage" resuCOMPLIANCE_REQUIRltMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+    <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
         select
         <include refid="Base_Column_List"/>
         from

From f43ac650e009a89057934b1e24a1809e036c511e Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 12 Aug 2021 09:29:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandProjectLibraryServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 3fb2b859..6097ac73 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -106,8 +106,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     @Override
     public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
-        wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName");
-        wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager");
+        wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName");
+        wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager");
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());