代码合并

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -2228,7 +2228,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         }
 
         // 省内企业标志
-        boolean shanXiFlag = false;
+        boolean shanXiFlag;
         // 企业
         if (companyType.equals(BaseController.COMPANY_TYPE_COMPANY)) {
             TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery()
@@ -2237,6 +2237,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             unitTypes = Arrays.asList(enterpriseInfo.getUnitType().split("#"));
 
             shanXiFlag = enterpriseInfo.getDataSources().equals(UnitDataSourceEnum.SHAANXI.getName());
+        } else {
+            shanXiFlag = false;
         }
 
         unitTypes.forEach(unitType -> {