From 19dc40974284e11d1971751a9ecd737ed0792a4b Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 5 Aug 2021 14:01:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B--=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=AD=A3=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=94=E8=AF=A5=E5=9C=A8excel=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E7=AC=AC=E4=BA=8C=E8=A1=8C=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=89=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/TableToExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index 99d2e19f..ad240f40 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -40,8 +40,8 @@ public class TableToExcel { Cell hCell=headRow.createCell(j++); hCell.setCellValue(columnMap.get(key)); } - //从第三行开始填充数据 - int c=2; + //从第二行开始填充数据 + int c=1; for(int k=i*sheetRow;k Date: Fri, 6 Aug 2021 13:43:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=A0=87=E5=87=86=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E6=98=AF=E5=85=B3=E8=81=94=E6=A0=87=E5=87=86?= =?UTF-8?q?id=E5=92=8C=E9=A1=B9=E7=9B=AEid=E5=88=A0=E9=99=A4=E8=80=8C?= =?UTF-8?q?=E6=98=AF=E7=9B=B4=E6=8E=A5=E6=8C=89=E7=85=A7=E6=A0=87=E5=87=86?= =?UTF-8?q?id=E5=88=A0=E9=99=A4=E6=A0=87=E5=87=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 22 ++++++++++++++++++- .../dao/SarStandProjectLibraryDao.java | 5 ++--- .../SarStandProjectLibraryService.java | 2 +- .../SarStandProjectLibraryServiceImpl.java | 10 ++++++--- .../SarStandProjectLibraryMapper.xml | 8 +++---- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 97c677f2..6af63af1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -125,8 +125,28 @@ public class SarStandProjectLibraryController extends BaseController list = Arrays.asList(ids); + String proId = null; + String standId = null; + //声明List + List list = new ArrayList<>(); + for (int i=0;i< ids.length;i++){ + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + //引入一个变量来记录"-"的位置 + int breakPosition = ids[i].indexOf("-"); + //proId 项目id 是从头开始到分隔符为止的字符串 + proId = ids[i].substring(0,breakPosition); + //standId 标准id 是从分隔符+1位开始到结束为止的字符串 + standId = ids[i].substring(breakPosition+1); + //把项目id赋值 + standProjectRelationDto.setProjectId(proId); + //把标准id赋值 + standProjectRelationDto.setStandId(standId); + //把值放到list里 + list.add(standProjectRelationDto); + } + sarStandProjectLibraryService.deleteByIds(list); return Result.success("200","删除成功"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 7316507a..93f687c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -3,7 +3,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,7 +16,7 @@ import java.util.List; * @since 2021-06-15 */ public interface SarStandProjectLibraryDao extends BaseMapper { -// List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); - void deleteByIds(@Param("ids") List ids); + List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); + void deleteByIds(@Param("ids") List ids); void batchInsert(@Param("list") List list); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 6c8745fa..f8179596 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -14,7 +14,7 @@ public interface SarStandProjectLibraryService { List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId); - void deleteByIds(List ids); + void deleteByIds(List ids); void batchInsert(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); 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 daefcd71..510130bc 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 @@ -39,7 +39,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { + public IPage queryMaintenanceProject(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); sar.setProjectPlatfor(sarDto.getProjectPlatfor()); sar.setProjectNumber(sarDto.getProjectNumber()); @@ -80,7 +81,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { + public IPage queryNotMaintenanceProject(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); sar.setProjectPlatfor(sarDto.getProjectPlatfor()); sar.setProjectNumber(sarDto.getProjectNumber()); @@ -202,13 +204,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids) { sarStandProjectLibraryDao.deleteByIds(ids); } + @Override public void batchInsert(List list) { sarStandProjectLibraryDao.batchInsert(list); } + @Override public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) { List ids = standAttrInfoExcelDto.getIds(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 2a597c7b..04ca2f77 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -19,10 +19,10 @@ - delete from sar_stand_project_relation where stand_id in ( - - #{list} + delete from sar_stand_project_relation where + + ( project_id= #{list.projectId} and stand_id = #{list.standId} ) - ) + From 29240d6db5e9c4de1705e6c7ab578488a13de41c Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 6 Aug 2021 15:20:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E4=B8=AD=E2=80=9C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E2=80=9D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=A0=87=E5=87=86=E5=8F=B7",?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 007690bf..730446d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -27,8 +27,8 @@ public class LawsDto { @ApiModelProperty(value = "主键") private String id; - @ExcelProperty(value = "标准编号", index = 0) - @ApiModelProperty(value = "标准编号") + @ExcelProperty(value = "标准号", index = 0) + @ApiModelProperty(value = "标准号") private String standNumber; @ExcelProperty(value = "中文名称", index = 1) From 9f4bbd2eb69c1c4c2abb10f8b4550663b8c6ff0d Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 6 Aug 2021 13:43:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=A0=87=E5=87=86=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E6=98=AF=E5=85=B3=E8=81=94=E6=A0=87=E5=87=86?= =?UTF-8?q?id=E5=92=8C=E9=A1=B9=E7=9B=AEid=E5=88=A0=E9=99=A4=E8=80=8C?= =?UTF-8?q?=E6=98=AF=E7=9B=B4=E6=8E=A5=E6=8C=89=E7=85=A7=E6=A0=87=E5=87=86?= =?UTF-8?q?id=E5=88=A0=E9=99=A4=E6=A0=87=E5=87=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 22 ++++++++++++++++++- .../dao/SarStandProjectLibraryDao.java | 5 ++--- .../SarStandProjectLibraryService.java | 2 +- .../SarStandProjectLibraryServiceImpl.java | 10 ++++++--- .../SarStandProjectLibraryMapper.xml | 8 +++---- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 97c677f2..6af63af1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -125,8 +125,28 @@ public class SarStandProjectLibraryController extends BaseController list = Arrays.asList(ids); + String proId = null; + String standId = null; + //声明List + List list = new ArrayList<>(); + for (int i=0;i< ids.length;i++){ + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + //引入一个变量来记录"-"的位置 + int breakPosition = ids[i].indexOf("-"); + //proId 项目id 是从头开始到分隔符为止的字符串 + proId = ids[i].substring(0,breakPosition); + //standId 标准id 是从分隔符+1位开始到结束为止的字符串 + standId = ids[i].substring(breakPosition+1); + //把项目id赋值 + standProjectRelationDto.setProjectId(proId); + //把标准id赋值 + standProjectRelationDto.setStandId(standId); + //把值放到list里 + list.add(standProjectRelationDto); + } + sarStandProjectLibraryService.deleteByIds(list); return Result.success("200","删除成功"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 7316507a..93f687c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -3,7 +3,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,7 +16,7 @@ import java.util.List; * @since 2021-06-15 */ public interface SarStandProjectLibraryDao extends BaseMapper { -// List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); - void deleteByIds(@Param("ids") List ids); + List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); + void deleteByIds(@Param("ids") List ids); void batchInsert(@Param("list") List list); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 6c8745fa..f8179596 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -14,7 +14,7 @@ public interface SarStandProjectLibraryService { List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId); - void deleteByIds(List ids); + void deleteByIds(List ids); void batchInsert(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); 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 daefcd71..510130bc 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 @@ -39,7 +39,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { + public IPage queryMaintenanceProject(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); sar.setProjectPlatfor(sarDto.getProjectPlatfor()); sar.setProjectNumber(sarDto.getProjectNumber()); @@ -80,7 +81,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { + public IPage queryNotMaintenanceProject(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); sar.setProjectPlatfor(sarDto.getProjectPlatfor()); sar.setProjectNumber(sarDto.getProjectNumber()); @@ -202,13 +204,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids) { sarStandProjectLibraryDao.deleteByIds(ids); } + @Override public void batchInsert(List list) { sarStandProjectLibraryDao.batchInsert(list); } + @Override public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) { List ids = standAttrInfoExcelDto.getIds(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 2a597c7b..04ca2f77 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -19,10 +19,10 @@ - delete from sar_stand_project_relation where stand_id in ( - - #{list} + delete from sar_stand_project_relation where + + ( project_id= #{list.projectId} and stand_id = #{list.standId} ) - ) + From f8e0ce0be1e2a763f488385cb607db3f09178030 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 5 Aug 2021 14:01:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B--=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=AD=A3=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=94=E8=AF=A5=E5=9C=A8excel=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E7=AC=AC=E4=BA=8C=E8=A1=8C=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=89=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/TableToExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index 99d2e19f..ad240f40 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -40,8 +40,8 @@ public class TableToExcel { Cell hCell=headRow.createCell(j++); hCell.setCellValue(columnMap.get(key)); } - //从第三行开始填充数据 - int c=2; + //从第二行开始填充数据 + int c=1; for(int k=i*sheetRow;k Date: Fri, 6 Aug 2021 17:08:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B2=B3=E5=BF=97=E8=88=AA=E6=94=B9?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/sys/UserEOMapper.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 8220853c..45a34226 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -480,11 +480,12 @@ SELECT * FROM( SELECT temp_user.*, ROWNUM rn FROM( - SELECT TEMP.* FROM ( + SELECT TEMP.* , + @rowno:=@rowno+1 as ROWNUM FROM ( SELECT - TU.usid,max(TU.USER_TYPE) as USER_TYPE,max(TU."ACCOUNT") as ACCOUNT,MAX(TU.UNAME) AS UNAME,MAX(TU.EMAIL) AS + TU.usid,max(TU.USER_TYPE) as USER_TYPE,max(TU.ACCOUNT) as ACCOUNT,MAX(TU.UNAME) AS UNAME,MAX(TU.EMAIL) AS EMAIL,MAX(TU.WORK_NUM) AS WORK_NUM, - MAX(TU.DISABLE_FLAG) AS DISABLE_FLAG,MAX(tu.modify_time) AS modify_time,MAX(tr."NAME") AS + MAX(TU.DISABLE_FLAG) AS DISABLE_FLAG,MAX(tu.modify_time) AS modify_time,MAX(tr.NAME) AS ROLE_NAME,MAX(tui.mobile_phone)AS mobile_phone, MAX(tui.office_phone) AS office_phone,MAX(tui.ADDRESS) AS ADDRESS,MAX(tui.FAX_ADDRESS) AS FAX_ADDRESS,MAX(tor.org_name) AS org_name, @@ -499,7 +500,7 @@ LEFT JOIN TS_ORG tor ON (tor. ID = tuo.org_id and tor.VALID_FLAG = 0) GROUP BY tu.usid - ) TEMP + ) TEMP ,(select @rowno:=0) ts ORDER BY TEMP.modify_time DESC,TEMP.usid ) temp_user WHERE ROWNUM <= ${pager.endIndex} ) a