luobang 2 years ago
parent
commit
c001f37e99

+ 3 - 2
src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -122,8 +122,9 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         String userDep ="";
         String capacityTel="";
         String capacityNumber="";
-        String capacityVip="否";
-        String capacityGps="否";
+        String capacityVip=null;
+        String capacityGps=null;
+        String capacityBlackList=null;
         if (!("".equals(map.get("remark")))&&map.get("remark")!=null){
             remark = (String) map.get("remark");
         }

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -210,7 +210,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
                     Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
                     Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
                     String userRoleId = userRoleMap.get("userRoleId").toString();
-                    Map<String,Object> resultMap = ssoFeign.sysuserrole("Bearer " + token, userId);
+                    Map<String,Object> resultMap = ssoFeign.sysuserrole("Bearer " + token, userRoleId);
                     System.out.println(resultMap);
                     Map<String,Object> resultMap1 = ssoFeign.addUserroles("Bearer " + token,userId, consigneeCompanyName, "1054405653877100544");
                     System.out.println(resultMap1);

+ 3 - 8
src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -916,13 +916,8 @@
   </update>
 
   <update id="updatecapacityTel">
-     update RMS_CAPACITY RC
-     set RC.CAPACITY_TEL=#{capacityTel},
-         RC.CAPACITY_VIP=#{capacityVip},RC.CAPACITY_GPS=#{capacityGps}
-     where RC.CAPACITY_NUMBER=#{capacityNumber} and
-           CARRIER_ID in (select RC.CARRIER_ID FROM  RMS_CAPACITY_CARRIER RCC
-                          LEFT JOIN RMS_CAPACITY RC
-                        ON  RC.CAPACITY_ID = RCC.CAPACITY_ID
-                        where RCC.CAPACITY_CARRIER_ID=#{capacityCarrierId})
+    update RMS_CAPACITY RC
+    set RC.CAPACITY_TEL=#{capacityTel}
+    where RC.CAPACITY_NUMBER=#{capacityNumber}
   </update>
 </mapper>