Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipmentClassifyDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
@@ -446,6 +447,26 @@ public class CommonController extends BaseController {
 
 
     /**
+     * 获取当前登录人单位及以下管辖分局树
+     *
+     * @return result
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getOrgTreeByCompanyLevel")
+    @ApiOperation(httpMethod = "GET", value = "按照当前登录人单位类型返回管辖机构树", notes = "按照当前登录人单位类型返回管辖机构树，")
+    public ResponseModel<Object> getOrgTreeByCompanyLevel() {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String orgCode = reginParams.getCompany().getOrgCode();
+
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {  // 公司类型人员返回全部树
+            return getCreatTree();
+        } else {                                                                               //  监管机构返回当前登录人机构及一下（只考虑非审批机构使用）
+            return ResponseHelper.buildResponse(commonService.loginUnitAndBelowGetTree(orgCode));
+        }
+    }
+
+
+    /**
      * 获取管辖分局树
      *
      * @return

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

@@ -413,10 +413,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if("unit".equals(jgUseRegistration.getManageType())){
             if (registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
                 if(inspectionDetectionInfo.getInspectReportNo() != null && inspectionDetectionInfo.getInspectReport() != null) {
-                // 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
-                String record = equipment.get("record").toString();
-                inspectionDetectionInfo.setInspectConclusion((String) equipment.get("inspectConclusionCode"));
-                saveEquipOfPieLineInspectData(record, inspectionDetectionInfo);
+                    // 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
+                    String record = equipment.get("record").toString();
+                    inspectionDetectionInfo.setInspectConclusion((String) equipment.get("inspectConclusionCode"));
+                    saveEquipOfPieLineInspectData(record, inspectionDetectionInfo);
                 }
             }
         } else {