'提交'

src/main/resources/application-prod.yml

@@ -26,22 +26,22 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8095}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8000}
+    url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8000}
+    url: ${RMSFEIGN_URL:172.16.90.202:80}
 #    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:8000}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8000}
+    url: ${REPORTFEIGN_URL:172.16.90.202:80}
 
 
 #远程调用

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -162,8 +162,10 @@
             </if>
             )
             <where>
+            <if test="companyType != null and companyType == '业务单位'">
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.rootCompanyFilter"></include>
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+            </if>
             </where>
             FETCH NEXT 10 ROWS ONLY
         )
@@ -296,8 +298,8 @@
         select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
-        OPERATION_POINT_NAME "label",
-        OPERATION_POINT_NAME "text"
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
 
         from RMS_OPERATION_POINT
         <where>
@@ -312,7 +314,7 @@
                 AND OPERATION_POINT_ID =  #{shippingPointId}
             </if>
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
+                AND REGEXP_LIKE(OPERATION_POINT_CODE || OPERATION_POINT_NAME, #{index})
             </if>
             <if test="sourceFlag != null and sourceFlag !=''">
                 AND ALTERNATE_FIELDS1 = #{sourceFlag}
@@ -324,8 +326,8 @@
         UNION select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
-        OPERATION_POINT_NAME "label",
-        OPERATION_POINT_NAME "text"
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
         from RMS_OPERATION_POINT
         where  OPERATION_POINT_ID in
         <foreach collection="id" item="item"  open="(" close=")" separator="," >