配合董凯解决地图数据没有的问题

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -266,6 +266,10 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
                 sysUserJzgAppMapper.updateById(jzgUserApp);
             }else if(!system.equals(SystemConstants.SYSTEM_PLATFORM.getCode())){
                 SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(weblogUser.getId(),system);
+                log.info("租户[{}]下用户[{}]不存在",system,weblogUser.getId());
+                if(jzgUserInfo == null){
+                    throw new SystemException("租户下用户不存在");
+                }
                 name = jzgUserInfo.getName();
                 workNumber = jzgUserInfo.getWorkNumber();
                 province = jzgUserInfo.getProvince();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/HomepageDataController.java

@@ -36,7 +36,7 @@ public class HomepageDataController extends BaseController  {
     public HttpResult<List<BusinessDistributionVo>> getBusinessDistribution(@RequestParam(value = "province") String province) {
         String userId = getUserId();
         String systemCode = getSystemCode();
-        List<BusinessDistributionVo> businessDistributionVos = insOrdersService.getBusinessDistribution(userId, systemCode, province);
+        List<BusinessDistributionVo> businessDistributionVos = insOrdersService.getBusinessDistribution(province,userId, systemCode);
         return HttpResult.ok(businessDistributionVos);
     }
 

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

@@ -1575,6 +1575,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public List<BusinessDistributionVo> getBusinessDistribution(String province, String userId, String systemCode) {
+        log.info("查询地区：province=[{}],userId=[{}]，systemCode=[{}]", province, userId, systemCode);
         if (!StringUtils.hasText(province)) {
             return this.baseMapper.getCityBusinessDistribution( userId,  systemCode);
         }

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -1443,14 +1443,18 @@
         FROM sys_user_jzg_info u
                  LEFT JOIN sys_dept d on u.dept_id = d.id
                  LEFT JOIN sys_area a ON d.city = a.area_code
-        where d.province = #{province}
-          AND u.user_id in (select distinct suji.user_id
-                            from sys_user_jzg_info suji
-                                     left join sys_role_data_scope_link srdsl on suji.dept_id = srdsl.dept_id
-                                     left join sys_user_role sur on sur.role_id = srdsl.role_id
-                            where sur.user_id = #{userId}
-                              and suji.system_code = #{systemCode}
-                            UNION ALL select #{userId} as user_id )
+        <where>
+            <if test="province != null and province != ''">
+                and d.province = #{province}
+            </if>
+            AND u.user_id in (select distinct suji.user_id
+            from sys_user_jzg_info suji
+            left join sys_role_data_scope_link srdsl on suji.dept_id = srdsl.dept_id
+            left join sys_user_role sur on sur.role_id = srdsl.role_id
+            where sur.user_id = #{userId}
+            and suji.system_code = #{systemCode}
+            UNION ALL select #{userId} as user_id )
+        </where>
         GROUP BY a.area_code, a.area_cname
         ORDER BY total_salesman_count DESC
     </select>