Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -120,8 +120,9 @@ public class UdiRelevanceController {
                 filterUdiRelRequest.setUuid(temps.get(0).getUuid());
                 filterUdiRelRequest.setNameCode(null);
             }
-        } else
+        } else {
             filterUdiRelRequest.setDiType(1);
+        }
         List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -316,9 +316,9 @@
             </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
-                nameCode LIKE concat('%', #{nameCode}, '%')
+                nameCode LIKE concat('%', #{unionCode}, '%')
-                or ybbm LIKE concat('%', #{nameCode}, '%')
+                or ybbm LIKE concat('%', #{unionCode}, '%')
-                or sptm LIKE concat('%', #{nameCode}, '%'))
+                or sptm LIKE concat('%', #{unionCode}, '%'))
             </if>
             <if test="isDisable == false">
                 AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)