From a7c502b0fe5b7956a053d20ca4f721011da095b9 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Wed, 17 Nov 2021 15:09:10 +0800
Subject: [PATCH 1/3] feat: There is no way the,

---
 .../src/main/java/com/adc/da/util/WaterMarkUtil.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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..24917631 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.3f);
                 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);

From 6aa402fbce7e7fa181daeb3f941cd16727d479d6 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Wed, 17 Nov 2021 15:24:15 +0800
Subject: [PATCH 2/3] feat: There is no way the,

---
 adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 24917631..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,7 +49,7 @@ public class WaterMarkUtil {
                 // set Transparency
                 PdfGState gs = new PdfGState();
                 // 设置透明度为0.2
-                gs.setFillOpacity(0.3f);
+                gs.setFillOpacity(0.25f);
                 under.setGState(gs);
                 under.restoreState();
                 under.beginText();

From c221064c4c85e3b4db0fec6add1a33c8247a1a0a Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Wed, 17 Nov 2021 17:25:28 +0800
Subject: [PATCH 3/3] feat: There is no way the,

---
 .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
         </if>
         <if test='page.standType != null and page.standType == "FOREIGN"'>
             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
         </if>
     </sql>
     <sql id="standSort_out">
@@ -1143,7 +1143,7 @@
             ${orderByA} ${order1},
         </if>
         <include refid="standSort_out"/>
-        a.STAND_YEAR DESC,a.id
+        a.STAND_NUMBER ASC,a.STAND_YEAR DESC,a.id
     </select>
 
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">