代码格式化样式

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java

@@ -68,7 +68,8 @@ public class LeaseApplicationService {
 
     @Autowired
     private IShipperLeaseDetailsService shipperLeaseDetailsService;
-
+    @Autowired
+    private SystemServiceFeign systemServiceFeign;
 
     /**
      * 分页查询租赁管理列表
@@ -77,6 +78,7 @@ public class LeaseApplicationService {
     public List<LeasePO> queryList(LeaseDO leaseDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         //前端传organizationId = 2827的时候查询所有组织的数据
+        if (loginUser != null) {
             Long frontendOrganizationId = leaseDO.getOrganizationId();
             if (frontendOrganizationId != null && frontendOrganizationId == 2827L) {
                 // 前端传递2827时，查询所有组织的数据，将organizationId设置为null
@@ -90,10 +92,10 @@ public class LeaseApplicationService {
                     }
                 }
             }
+        }
         return leaseDomainService.queryList(leaseDO);
     }
 
-
     /**
      * 新增租赁管理
      */
@@ -113,12 +115,9 @@ public class LeaseApplicationService {
         return leaseDomainService.insert(leaseDO);
     }
 
-    @Autowired
-    private SystemServiceFeign systemServiceFeign;
-
     private void setWarehouseInfo(LeaseDO leaseDO) {
         AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(leaseDO.getWarehouseId());
-        if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+        if (!"200".equals(String.valueOf(ajaxResult.get("code")))) {
             throw new ServiceException("获取仓库信息失败");
         }
         WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class);
@@ -158,19 +157,18 @@ public class LeaseApplicationService {
     /**
      * 获取租赁管理详细信息
      */
-    public LeasePO getInfo(Long leaseId)
-    {
+    public LeasePO getInfo(Long leaseId) {
         return leaseDomainService.getInfo(leaseId);
     }
 
     /**
+     * @param leaseIds
+     * @return Boolean
      * @description 批量作废租赁
      * @author ZhouGY
      * @date 2024/5/13 9:46
-     * @param leaseIds
-     * @return Boolean
      */
-    public Boolean nullifyByIds(List<Long> leaseIds){
+    public Boolean nullifyByIds(List<Long> leaseIds) {
         return leaseDomainService.nullifyByIds(leaseIds);
     }
 
@@ -311,9 +309,9 @@ public class LeaseApplicationService {
             BigDecimal fractionalLeaseArea = BigDecimal.ZERO;
             //计算整租和散租
             for (ShipperLeaseDetailsPO shipperLeaseDetail : shipperLeaseDetails) {
-                if (shipperLeaseDetail.getLeaseType().equals("整租")){
+                if (shipperLeaseDetail.getLeaseType().equals("整租")) {
                     entireLeaseArea = entireLeaseArea.add(shipperLeaseDetail.getLeaseArea());
-                }else {
+                } else {
                     fractionalLeaseArea = fractionalLeaseArea.add(shipperLeaseDetail.getLeaseArea());
                 }
                 warehouseOccupancyRate.setWarehouseName(shipperLeaseDetail.getWarehouseName());