修稿

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -40,7 +40,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation("登录接口")
     @PostMapping("bpLogin")
-    public Map<String,Object> bpLogin(@RequestParam String loginName, @RequestParam String password,  @RequestParam String app_code,@RequestParam String urlFlag) {
+    public Map<String,Object> bpLogin(@RequestParam String loginName, @RequestParam String password,  @RequestParam String app_code,@RequestParam(required = false) String urlFlag) {
         Map<String,Object> resMap = ssoUtil.individualLogin(loginName,password,app_code);
         if("succeed".equals(resMap.get("status"))) {
             Map<String, Object> dataMap = (Map<String, Object>) resMap.get("data");

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev2}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -283,6 +283,7 @@
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label",
         OPERATION_POINT_NAME "text"
+
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
@@ -298,6 +299,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
             </if>
+            <if test="sourceFlag != null and sourceFlag !=''">
+                AND ALTERNATE_FIELDS1 = #{sourceFlag}
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
     )
@@ -905,7 +909,7 @@
         RC.MATERIAL_NAME "materialName",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
-        RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+        RC.MATERIAL_NAME  || '-' || RC.MATERIAL_CODE ||
         (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
         THEN '-' || RC.MATERIAL_SPECIFICATION
         WHEN RC.MATERIAL_MODEL IS NOT NULL