From 4ef567a9f39d0179b74873b61bf73200013a6477 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Mon, 21 Apr 2025 15:32:01 +0800
Subject: [PATCH] no message

---
 .../classes/config/origen/shipment/shipmentOrderQueryPage.xml   | 2 +-
 .../config/origen/signOrder/maintainSingOrderAuditingPage.xml   | 2 +-
 .../classes/config/origen/signOrder/maintainSingOrderPage.xml   | 2 +-
 .../classes/config/origen/shipment/shipmentOrderQueryPage.xml   | 2 +-
 .../config/origen/signOrder/maintainSingOrderAuditingPage.xml   | 2 +-
 .../classes/config/origen/signOrder/maintainSingOrderPage.xml   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
index fc85cf9..c651bd4 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
@@ -103,7 +103,7 @@
  left join orders.toLocation.city.zone toZone 
  left join orders.routeFee
  WHERE pf = #{SESSION_PLATFORM}   and orders.isShortBarge=false
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
  and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
  /~order.code: AND orders.code like {order.code}~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
index f78f687..9d0bbd8 100644
--- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
@@ -100,7 +100,7 @@
  left join orders.contractor as pf
  left join orders.extends1 vt1 
  where orders.contractor = #{SESSION_PLATFORM}
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
  and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
 /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 /~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
index 0208e51..3d4a451 100644
--- a/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
@@ -95,7 +95,7 @@
  left join orders.extends1 vt1
  where orders.contractor = #{SESSION_PLATFORM} 
  and orders.status !='CANCEL'  
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
  and (orders.status !='SIGNED' or (/~isAll:  {isAll} = true~/))
  /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
index fc85cf9..c651bd4 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
@@ -103,7 +103,7 @@
  left join orders.toLocation.city.zone toZone 
  left join orders.routeFee
  WHERE pf = #{SESSION_PLATFORM}   and orders.isShortBarge=false
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
  and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
  /~order.code: AND orders.code like {order.code}~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
diff --git a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
index f78f687..9d0bbd8 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
@@ -100,7 +100,7 @@
  left join orders.contractor as pf
  left join orders.extends1 vt1 
  where orders.contractor = #{SESSION_PLATFORM}
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
  and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll:  {ordersAll} = true~/  ))
 /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
 /~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
diff --git a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
index 0208e51..3d4a451 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml
@@ -95,7 +95,7 @@
  left join orders.extends1 vt1
  where orders.contractor = #{SESSION_PLATFORM} 
  and orders.status !='CANCEL'  
- and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
+ and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} or '财务' in (select group.name from Group group,User user where user.name=#{SESSION_USERS_NAME}  ) )
  and (orders.status !='SIGNED' or (/~isAll:  {isAll} = true~/))
  /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/