合并代码

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

@@ -133,15 +133,6 @@ public class RmsCapacityController extends BaseRESTfulController {
                 mapValue.put("carrierSSOId", carrierSSOId);
             }
         }
-
-//        if (con != null && con.equals("")) {
-//            con = null;
-//        }
-//        if (con != null && !con.equals("undefined")){
-//            mapValue.put("con","%" + con +"%");
-//        }
-//        List<Map<String,Object>> listTotal = rmsCapacityService.getCapacityList(mapValue);
-//=======
         if(con != null){
             if(!"".equals(con)){
                 mapValue.put("index", con);

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

@@ -726,7 +726,7 @@
         and RCA.CARRIER_SSO_ID = #{carrierSSOId}
       </if>
       <if test="index != null">
-        and instr(RC.CAPACITY_NUMBER, #{index}) > 0
+        and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
       </if>
     ORDER BY RC.INSERT_TIME DESC
     )