diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java
index 5c5bd8cb..34575906 100644
--- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java
+++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java
@@ -49,15 +49,15 @@ public class WaterMarkUtil {
// set Transparency
PdfGState gs = new PdfGState();
// 设置透明度为0.2
- gs.setFillOpacity(0.4f);
+ gs.setFillOpacity(0.25f);
under.setGState(gs);
under.restoreState();
under.beginText();
- under.setFontAndSize(base, 56);
+ under.setFontAndSize(base, 50);
under.setTextMatrix(30, 30);
under.setColorFill(BaseColor.LIGHT_GRAY);
- for (int y = 0; y < 10; y++) {
- for (int x = 0; x < 8; x++) {
+ for (int y = 0; y < 5; y++) {
+ for (int x = 0; x < 10; x++) {
// 水印文字成45度角倾斜
under.showTextAligned(Element.ALIGN_LEFT
, waterMarkName, 100 + 300 * x, 300 * y, 40);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 7b1aba8f..b3792ef9 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -603,7 +603,7 @@
when 'HJ' THEN 7
ELSE 8
END,
- sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
+ sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
CASE sar_standards_info.stand_sort
@@ -633,7 +633,7 @@
when 'ADR' THEN 23
ELSE 24
END,
- sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
+ sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
@@ -1143,7 +1143,7 @@
${orderByA} ${order1},
- a.STAND_YEAR DESC,a.id
+ a.STAND_NUMBER ASC,a.STAND_YEAR DESC,a.id