Просмотр исходного кода

修复h5订单列表数据问题
修复h5报检单报错的问题

785834757 1 месяц назад
Родитель
Сommit
505c3d09ca

+ 7 - 7
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1096,31 +1096,31 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             switch (code) {
                 case 1:
                     // 报价成功
-                    data.put("1", orderMaps.get("1"));
+                    data.put("1", Objects.isNull(orderMaps.get("1")) ? new ArrayList<>() : orderMaps.get("1"));
                     break;
                 case 2:
                     // 核保中
-                    data.put("2", orderMaps.get("2"));
+                    data.put("2", Objects.isNull(orderMaps.get("2")) ? new ArrayList<>() : orderMaps.get("2"));
                     break;
                 case 3:
                     // 未报价
-                    data.put("3", null);
+                    data.put("3", Objects.isNull(orderMaps.get("3")) ? new ArrayList<>() : orderMaps.get("3"));
                     break;
                 case 4:
                     // 待缴费
-                    data.put("4", orderMaps.get("4"));
+                    data.put("4", Objects.isNull(orderMaps.get("4")) ? new ArrayList<>() : orderMaps.get("4"));
                     break;
                 case 5:
                     // 已承保
-                    data.put("5", orderMaps.get("5"));
+                    data.put("5", Objects.isNull(orderMaps.get("5")) ? new ArrayList<>() : orderMaps.get("5"));
                     break;
                 case 6:
                     // 报价失败
-                    data.put("6", orderMaps.get("6"));
+                    data.put("6", Objects.isNull(orderMaps.get("6")) ? new ArrayList<>() : orderMaps.get("6"));
                     break;
                 case 7:
                     // 核保失败
-                    data.put("7", orderMaps.get("7"));
+                    data.put("7", Objects.isNull(orderMaps.get("7")) ? new ArrayList<>() : orderMaps.get("7"));
                     break;
             }
         }

+ 15 - 13
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1347,19 +1347,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public SalesmanVo getUserInfoBySystemCodeAndUserId(String userId) {
         SalesmanVo salesmanVo = sysUserJzgInfoMapper.getUserInfoBySystemCodeAndUserId(userId);
-        String leaderId = salesmanVo.getLeaderId();
-        if(StrUtil.isEmpty(leaderId)){
-            return salesmanVo;
-        }
-        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(leaderId);
-        if(sysUserJzgInfo == null){
-            return salesmanVo;
-        }
-        String leaderUserId = sysUserJzgInfo.getUserId();
-        salesmanVo.setRealQuoteUserManagerId(leaderUserId);
-        SysUser sysUser = sysUserMapper.selectById(leaderUserId);
-        if(sysUser != null){
-            salesmanVo.setRealQuoteUserManagerUseName(sysUser.getUsername());
+        if(Objects.nonNull(salesmanVo)){
+            String leaderId = salesmanVo.getLeaderId();
+            if(StrUtil.isEmpty(leaderId)){
+                return salesmanVo;
+            }
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(leaderId);
+            if(sysUserJzgInfo == null){
+                return salesmanVo;
+            }
+            String leaderUserId = sysUserJzgInfo.getUserId();
+            salesmanVo.setRealQuoteUserManagerId(leaderUserId);
+            SysUser sysUser = sysUserMapper.selectById(leaderUserId);
+            if(sysUser != null){
+                salesmanVo.setRealQuoteUserManagerUseName(sysUser.getUsername());
+            }
         }
         return salesmanVo;
     }