asd

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

@@ -126,10 +126,18 @@ public class RmsCapacityController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               String con) {
+                                               String con,
+                                               String carrierSSOId) {
+        int count = 0;
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
+        if(carrierSSOId != null){
+            if(!"null".equals(carrierSSOId)) {
+                mapValue.put("carrierSSOId", carrierSSOId);
+                count++;
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -142,7 +150,7 @@ public class RmsCapacityController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> listTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
+        if (mapValue.size() == count) {
             //将查询结果存入索引中
             listTotal = rmsCapacityService.getCapacityList(null);
             Map<String, Object> map = new HashMap<>();

src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java

@@ -162,6 +162,7 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         rmsCarrier.setRegisterOrganization((String) formMap.get("registerOrganization"));
         rmsCarrier.setRegisterAptitudes((String) formMap.get("registerAptitudes"));
         rmsCarrier.setContactsName((String) formMap.get("contactsName"));
+        rmsCarrier.setCarrierContactNumber(String.valueOf(formMap.get("carrierContactNumber")));
         //添加SSO主键
         String userId =(String) map.get("userId");
         rmsCarrier.setCarrierSsoId(userId);

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

@@ -717,13 +717,14 @@
     RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
     RCA.CARRIER_NAME AS "carrierName"
     FROM RMS_CAPACITY RC
-    LEFT JOIN
-    RMS_CAPACITY_TYPE RCT
-    ON RC.CAPACITY_TYPE_ID=RCT.CAPACITY_TYPE_ID
-    LEFT JOIN
-    RMS_CARRIER RCA
-    ON RCA.CARRIER_ID=RC.CARRIER_ID
-    WHERE RC.DELETED!=1
+    LEFT JOIN RMS_CAPACITY_TYPE RCT
+    ON RC.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+    LEFT JOIN RMS_CARRIER RCA
+    ON RCA.CARRIER_ID = RC.CARRIER_ID
+    WHERE RC.DELETED != 1
+      <if test="carrierSSOId != null">
+        and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+      </if>
     ORDER BY RC.INSERT_TIME DESC
     )
     <where>