no message

src/webapp/WEB-INF/classes/config/origen/monitor/maintainWayFillPage.xml

@@ -97,13 +97,13 @@ l.currentPosition,
  left join l.shipment.vehicle vehicle
  left join l.shipment.driver driver
  where 1=1
- and ( /~ordersAll:  {ordersAll} = true~/  )  
- and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM})
+ and l.executer=#{SESSION_PLATFORM} 
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or o.updateInfo.operatorName = #{SESSION_USERS_NAME} 
- or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ o.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') )    
  )
+ and ( /~ordersAll:  {ordersAll} = true~/  ) 
   /~orders.customerOrderNO: AND upper(l.order.customerOrderNO) like upper({orders.customerOrderNO})~/
   /~l.ecNo: AND upper(l.ecNo) like upper({l.ecNo})~/
   /~shipment.shipmentDepartment: AND (( shipment.shipmentDepartment ={shipment.shipmentDepartment} )

src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsDedicatedPage.xml

@@ -93,8 +93,9 @@ s          	<date id="l.order.planArriveTime1" title="order.planArriveTime" row=
  and l.status in( 'UNDISTRIBUTION' )
  and l.turnCar=1 
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ or #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') )   
  )
 /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
 /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/

src/webapp/WEB-INF/classes/config/origen/shipment/maintainOrderLegsPage.xml

@@ -110,8 +110,9 @@
  or (l.order.isShortBarge=1 and l.nodeIndex>1)
  )
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ l.order.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ or #{SESSION_USERS_NAME} = 'admin'
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') )   
  )
 /~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
 /~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/

src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml

@@ -119,11 +119,11 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
   left join shipment.customer
  WHERE 1=1  
  and shipment.platForm=#{SESSION_PLATFORM}
- and shipment.status!='CANCEL'
+ and shipment.status not in ('CANCEL')
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or shipment.operator = #{SESSION_USERS_NAME} 
- or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ shipment.operator = #{SESSION_USERS_NAME} 
+ or #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') )    
  )
   and ((/~shipment.operatorDate :{shipment.operatorDate} ~/=shipment.operatorDate)  or ( /~ordersAll: {ordersAll} = true~/ ))
  /~shipment.code: AND shipment.code like upper({shipment.code})~/

src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentZXPage.xml

@@ -111,15 +111,15 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
   left  join shipment.vehicleType 
   left join shipment.unloadingCompany 
  WHERE 1=1 
+ and shipment.platForm= #{SESSION_PLATFORM} 
  and shipment.shipmentDepartment='专线' 
  and shipment.isShortBarge=false 
- and shipment.platForm= #{SESSION_PLATFORM} 
+ and shipment.status not in ('CANCEL')
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or shipment.operator = #{SESSION_USERS_NAME} 
- or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ shipment.operator = #{SESSION_USERS_NAME} 
+ or #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') )    
  )
- and (shipment.status!='CANCEL' /~shipment.status: or 'CANCEL' = {shipment.status}~/ ) 
   /~shipment.code: AND shipment.code like upper({shipment.code})~/
   /~shipment.status: AND shipment.status = {shipment.status}~/
   /~shipment.carrier.id: AND shipment.carrier.id = {shipment.carrier.id}~/

src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml

@@ -106,9 +106,9 @@
  and pf = #{SESSION_PLATFORM}   
  and orders.isShortBarge=false
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
- or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) 
  )
  and (
  orders.status in('AVAILABLE','TRANS_AVAILABLE') 

src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml

@@ -102,9 +102,9 @@
  where 1=1
  and orders.contractor = #{SESSION_PLATFORM}
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
- or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
+ or #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') )  
  )
  and (
  orders.status in('AVAILABLE','TRANS_AVAILABLE') 

src/webapp/WEB-INF/classes/config/origen/signOrder/maintainSingOrderPage.xml

@@ -95,14 +95,13 @@
  left join orders.extends1 vt1
  where 1=1
  and orders.contractor = #{SESSION_PLATFORM} 
- and orders.status !='CANCEL'  
  and (
- #{SESSION_USERS_NAME} = 'admin' 
- or orders.updateInfo.operatorName = #{SESSION_USERS_NAME} 
- or '财务' in (select group.name from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME}) 
+ orders.updateInfo.operatorName = #{SESSION_USERS_NAME}
+ or  #{SESSION_USERS_NAME} = 'admin' 
+ or EXISTS ( select 1 from Group group,User user where group in elements(user.groups) and user.name=#{SESSION_USERS_NAME} and group.name in('财务','管理') ) 
  )
  and (
- orders.status !='SIGNED' 
+ orders.status not in('SIGNED') 
  or (/~isAll:  {isAll} = true~/)
  )
  /~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/