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

web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java

@@ -0,0 +1,71 @@
+package com.zcloud.basic.info.facade;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.PageResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.basic.info.api.DepartmentServiceI;
+import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor;
+import com.zcloud.basic.info.dto.DepartmentAddCmd;
+import com.zcloud.basic.info.dto.DepartmentPageQry;
+import com.zcloud.basic.info.dto.DepartmentUpdateCmd;
+import com.zcloud.basic.info.dto.clientobject.DepartmentCO;
+import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade;
+import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentAddCmd;
+import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentInfoQry;
+import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentPageQry;
+import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentUpdateCmd;
+import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo;
+import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade;
+import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author lin
+ */
+@DubboService
+public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade {
+
+    @Resource
+    private  DepartmentServiceI departmentService;
+    @Resource
+    private DepartmentCoConvertor departmentCoConvertor;
+
+    @Override
+    public SingleResponse<ZcloudDepartmentInfoCo> getDepartmentInfoById(ZcloudDepartmentInfoQry zcloudDepartmentInfoQry) {
+        DepartmentCO info = departmentService.info(zcloudDepartmentInfoQry.getId());
+        ZcloudDepartmentInfoCo zcloudDepartmentInfoCo = new ZcloudDepartmentInfoCo();
+        BeanUtils.copyProperties(info, zcloudDepartmentInfoCo);
+        return SingleResponse.of(zcloudDepartmentInfoCo);
+    }
+
+    @Override
+    public PageResponse<ZcloudDepartmentInfoCo> pageByParentId(ZcloudDepartmentPageQry zcloudDepartmentPageQry) {
+        DepartmentPageQry qry = new DepartmentPageQry();
+        BeanUtils.copyProperties(zcloudDepartmentPageQry, qry);
+        PageResponse<DepartmentCO> departmentCOPageResponse = departmentService.listPage(qry);
+        List<ZcloudDepartmentInfoCo> zcloudPage = departmentCoConvertor.converCOsToDoubbpCOs(departmentCOPageResponse.getData());
+        return PageResponse.of(zcloudPage, departmentCOPageResponse.getTotalCount(), departmentCOPageResponse.getPageSize(), departmentCOPageResponse.getPageIndex());
+    }
+
+    @Override
+    public SingleResponse addDepartment(ZcloudDepartmentAddCmd zcloudDepartmentAddCmd) {
+        DepartmentAddCmd addCmd =new DepartmentAddCmd();
+        BeanUtils.copyProperties(zcloudDepartmentAddCmd, addCmd);
+        return departmentService.add(addCmd);
+    }
+
+    @Override
+    public SingleResponse editDepartment(ZcloudDepartmentUpdateCmd zcloudDepartmentUpdateCmd) {
+        DepartmentUpdateCmd updateCmd =new DepartmentUpdateCmd();
+        BeanUtils.copyProperties(zcloudDepartmentUpdateCmd, updateCmd);
+        departmentService.edit(updateCmd);
+        return SingleResponse.buildSuccess();
+    }
+}

web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java

@@ -58,6 +58,10 @@ public class CorpInfoController {
     @ApiOperation("详情")
     @PostMapping("/info/{id}")
     public SingleResponse<CorpInfoCO> getInfoById(@PathVariable("id") Long id) {
+        if(id==null){
+            SSOUser ssoUser = AuthContext.getCurrentUser();
+            id = ssoUser.getTenantId();
+        }
         return SingleResponse.of(corpInfoService.info(id));
     }
 

web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java

@@ -36,7 +36,7 @@ public class CorpInfoXgfController {
     @ApiOperation("新增相关方企业")
     @PostMapping("/save")
     public SingleResponse<CorpInfoXgfCO> add(@Validated @RequestBody CorpInfoXgfAddCmd cmd) {
-        SSOUser ssoUser = AuthContext.getCurrentUser();
+
         return corpInfoXgfService.add(cmd);
     }
 
@@ -55,6 +55,10 @@ public class CorpInfoXgfController {
     @ApiOperation("相关方企业详情")
     @PostMapping("/info/{id}")
     public SingleResponse<CorpInfoXgfCO> getInfoById(@PathVariable("id") Long id) {
+        if(id==null){
+            SSOUser ssoUser = AuthContext.getCurrentUser();
+            id = ssoUser.getTenantId();
+        }
         return SingleResponse.of(corpInfoXgfService.info(id));
     }
 

web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java

@@ -3,6 +3,7 @@ package com.zcloud.basic.info.command.convertor;
 import com.zcloud.basic.info.dto.clientobject.DepartmentCO;
 import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
+import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo;
 import org.mapstruct.Mapper;
 
 import java.util.List;
@@ -23,5 +24,8 @@ public interface DepartmentCoConvertor {
     List<DepartmentCO> converDOsToCOs(List<DepartmentDO> departmentDOs);
 
     List<DepartmentTreeInfoCO> converDOsToInfoCOs(List<DepartmentDO> pageResponse);
+
+
+    List<ZcloudDepartmentInfoCo> converCOsToDoubbpCOs(List<DepartmentCO> departmentCOList);
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java

@@ -138,33 +138,33 @@ public class CorpInfoAddCmd extends Command {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate licenseEnd;
     @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true)
-    private Integer whetherHygiene;
+    private Integer whetherHygieneFlag;
     @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true)
-    private Integer whetherHazards;
+    private Integer whetherHazardsFlag;
     @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true)
-    private Integer whetherScarce;
+    private Integer whetherScarceFlag;
     @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true)
-    private Integer whetherChemicals;
+    private Integer whetherChemicalsFlag;
     @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true)
-    private Integer whetherSpecialequipment;
+    private Integer whetherSpecialequipmentFlag;
     @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true)
-    private Integer whetherSpecialpeople;
+    private Integer whetherSpecialpeopleFlag;
     @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true)
-    private Integer whetherCoalgas;
+    private Integer whetherCoalgasFlag;
     @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true)
-    private Integer whetherFire;
+    private Integer whetherFireFlag;
     @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true)
-    private Integer whetherConfined;
+    private Integer whetherConfinedFlag;
     @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true)
-    private Integer whetherPowder;
+    private Integer whetherPowderFlag;
     @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true)
-    private Integer whetherLightning;
+    private Integer whetherLightningFlag;
     @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true)
-    private Integer whetherPipeline;
+    private Integer whetherPipelineFlag;
     @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true)
-    private Integer whetherActinogen;
+    private Integer whetherActinogenFlag;
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true)
-    private Integer whetherLiquidammonia;
+    private Integer whetherLiquidammoniaFlag;
 
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java

@@ -142,33 +142,33 @@ public class CorpInfoUpdateCmd extends Command {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate licenseEnd;
     @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true)
-    private Integer whetherHygiene;
+    private Integer whetherHygieneFlag;
     @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true)
-    private Integer whetherHazards;
+    private Integer whetherHazardsFlag;
     @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true)
-    private Integer whetherScarce;
+    private Integer whetherScarceFlag;
     @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true)
-    private Integer whetherChemicals;
+    private Integer whetherChemicalsFlag;
     @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true)
-    private Integer whetherSpecialequipment;
+    private Integer whetherSpecialequipmentFlag;
     @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true)
-    private Integer whetherSpecialpeople;
+    private Integer whetherSpecialpeopleFlag;
     @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true)
-    private Integer whetherCoalgas;
+    private Integer whetherCoalgasFlag;
     @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true)
-    private Integer whetherFire;
+    private Integer whetherFireFlag;
     @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true)
-    private Integer whetherConfined;
+    private Integer whetherConfinedFlag;
     @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true)
-    private Integer whetherPowder;
+    private Integer whetherPowderFlag;
     @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true)
-    private Integer whetherLightning;
+    private Integer whetherLightningFlag;
     @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true)
-    private Integer whetherPipeline;
+    private Integer whetherPipelineFlag;
     @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true)
-    private Integer whetherActinogen;
+    private Integer whetherActinogenFlag;
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true)
-    private Integer whetherLiquidammonia;
+    private Integer whetherLiquidammoniaFlag;
 
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java

@@ -140,33 +140,33 @@ public class CorpInfoXgfUpdateCmd extends Command {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate licenseEnd;
     @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否", name = "whetherHygiene", required = true)
-    private Integer whetherHygiene;
+    private Integer whetherHygieneFlag;
     @ApiModelProperty(value = "有无重大危险源,1:是,0:否", name = "whetherHazards", required = true)
-    private Integer whetherHazards;
+    private Integer whetherHazardsFlag;
     @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否", name = "whetherScarce", required = true)
-    private Integer whetherScarce;
+    private Integer whetherScarceFlag;
     @ApiModelProperty(value = "是否涉及危化品,1:是,0:否", name = "whetherChemicals", required = true)
-    private Integer whetherChemicals;
+    private Integer whetherChemicalsFlag;
     @ApiModelProperty(value = "有无特种设备,1:是,0:否", name = "whetherSpecialequipment", required = true)
-    private Integer whetherSpecialequipment;
+    private Integer whetherSpecialequipmentFlag;
     @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否", name = "whetherSpecialpeople", required = true)
-    private Integer whetherSpecialpeople;
+    private Integer whetherSpecialpeopleFlag;
     @ApiModelProperty(value = "是否涉及煤气,1:是,0:否", name = "whetherCoalgas", required = true)
-    private Integer whetherCoalgas;
+    private Integer whetherCoalgasFlag;
     @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否", name = "whetherFire", required = true)
-    private Integer whetherFire;
+    private Integer whetherFireFlag;
     @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否", name = "whetherConfined", required = true)
-    private Integer whetherConfined;
+    private Integer whetherConfinedFlag;
     @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否", name = "whetherPowder", required = true)
-    private Integer whetherPowder;
+    private Integer whetherPowderFlag;
     @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否", name = "whetherLightning", required = true)
-    private Integer whetherLightning;
+    private Integer whetherLightningFlag;
     @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否", name = "whetherPipeline", required = true)
-    private Integer whetherPipeline;
+    private Integer whetherPipelineFlag;
     @ApiModelProperty(value = "是否持有放射源,1:是,0:否", name = "whetherActinogen", required = true)
-    private Integer whetherActinogen;
+    private Integer whetherActinogenFlag;
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否", name = "whetherLiquidammonia", required = true)
-    private Integer whetherLiquidammonia;
+    private Integer whetherLiquidammoniaFlag;
 /*    @ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
     private List<CorpInfoXgfItemCmd> employmentformList;
     @ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java

@@ -40,8 +40,8 @@ public class DepartmentAddCmd extends Command {
     private String levelName;
     @ApiModelProperty(value = "部门排序", name = "depOrder", required = true)
     private Integer depOrder;
-    @ApiModelProperty(value = "是否监管部门 0-否  1-是", name = "isSupervise", required = true)
+    @ApiModelProperty(value = "是否监管部门 0-否  1-是", name = "superviseFlag", required = true)
-    private Integer isSupervise;
+    private Integer superviseFlag;
 
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java

@@ -41,8 +41,8 @@ public class DepartmentUpdateCmd extends Command {
     private String levelName;
     @ApiModelProperty(value = "部门排序", name = "depOrder", required = true)
     private Integer depOrder;
-    @ApiModelProperty(value = "是否监管部门 0-否  1-是", name = "isSupervise", required = true)
+    @ApiModelProperty(value = "是否监管部门 0-否  1-是", name = "superviseFlag", required = true)
-    private Integer isSupervise;
+    private Integer superviseFlag;
 
 
 }

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java

@@ -41,7 +41,7 @@ public class DepartmentCO extends ClientObject {
     private Integer depOrder;
     //是否监管部门 0-否  1-是
     @ApiModelProperty(value = "是否监管部门 0-否  1-是")
-    private Integer isSupervise;
+    private Integer superviseFlag;
 
     //乐观锁
     @ApiModelProperty(value = "乐观锁")

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java

@@ -128,33 +128,33 @@ public class CorpInfoE extends BaseE {
     //营业执照结束时间
     private LocalDate licenseEnd;
     //有无职业卫生信息,1:是,0:否
-    private Integer whetherHygiene;
+    private Integer whetherHygieneFlag;
     //有无重大危险源,1:是,0:否
-    private Integer whetherHazards;
+    private Integer whetherHazardsFlag;
     //是否有稀缺大型应急物资或设施,1:是,0:否
-    private Integer whetherScarce;
+    private Integer whetherScarceFlag;
     //是否涉及危化品,1:是,0:否
-    private Integer whetherChemicals;
+    private Integer whetherChemicalsFlag;
     //有无特种设备,1:是,0:否
-    private Integer whetherSpecialequipment;
+    private Integer whetherSpecialequipmentFlag;
     //有无特存种作业人员,1:是,0:否
-    private Integer whetherSpecialpeople;
+    private Integer whetherSpecialpeopleFlag;
     //是否涉及煤气,1:是,0:否
-    private Integer whetherCoalgas;
+    private Integer whetherCoalgasFlag;
     //是否属于消防重点单位,1:是,0:否
-    private Integer whetherFire;
+    private Integer whetherFireFlag;
     //是否在有限空间作业,1:是,0:否
-    private Integer whetherConfined;
+    private Integer whetherConfinedFlag;
     //是否存在涉爆粉尘作业,1:是,0:否
-    private Integer whetherPowder;
+    private Integer whetherPowderFlag;
     //是否涉及防雷防静电,1:是,0:否
-    private Integer whetherLightning;
+    private Integer whetherLightningFlag;
     //是否涉及危化品管道,1:是,0:否
-    private Integer whetherPipeline;
+    private Integer whetherPipelineFlag;
     //是否持有放射源,1:是,0:否
-    private Integer whetherActinogen;
+    private Integer whetherActinogenFlag;
     //是否涉及液氨制冷,1:是,0:否
-    private Integer whetherLiquidammonia;
+    private Integer whetherLiquidammoniaFlag;
 
 
 

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java

@@ -126,33 +126,33 @@ public class CorpInfoXgfE extends BaseE {
     //营业执照结束时间
     private LocalDate licenseEnd;
     //有无职业卫生信息,1:是,0:否
-    private Integer whetherHygiene;
+    private Integer whetherHygieneFlag;
     //有无重大危险源,1:是,0:否
-    private Integer whetherHazards;
+    private Integer whetherHazardsFlag;
     //是否有稀缺大型应急物资或设施,1:是,0:否
-    private Integer whetherScarce;
+    private Integer whetherScarceFlag;
     //是否涉及危化品,1:是,0:否
-    private Integer whetherChemicals;
+    private Integer whetherChemicalsFlag;
     //有无特种设备,1:是,0:否
-    private Integer whetherSpecialequipment;
+    private Integer whetherSpecialequipmentFlag;
     //有无特存种作业人员,1:是,0:否
-    private Integer whetherSpecialpeople;
+    private Integer whetherSpecialpeopleFlag;
     //是否涉及煤气,1:是,0:否
-    private Integer whetherCoalgas;
+    private Integer whetherCoalgasFlag;
     //是否属于消防重点单位,1:是,0:否
-    private Integer whetherFire;
+    private Integer whetherFireFlag;
     //是否在有限空间作业,1:是,0:否
-    private Integer whetherConfined;
+    private Integer whetherConfinedFlag;
     //是否存在涉爆粉尘作业,1:是,0:否
-    private Integer whetherPowder;
+    private Integer whetherPowderFlag;
     //是否涉及防雷防静电,1:是,0:否
-    private Integer whetherLightning;
+    private Integer whetherLightningFlag;
     //是否涉及危化品管道,1:是,0:否
-    private Integer whetherPipeline;
+    private Integer whetherPipelineFlag;
     //是否持有放射源,1:是,0:否
-    private Integer whetherActinogen;
+    private Integer whetherActinogenFlag;
     //是否涉及液氨制冷,1:是,0:否
-    private Integer whetherLiquidammonia;
+    private Integer whetherLiquidammoniaFlag;
 
 }
 

web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java

@@ -34,7 +34,7 @@ public class DepartmentE extends BaseE {
     //部门排序
     private Integer depOrder;
     //是否监管部门 0-否  1-是
-    private Integer isSupervise;
+    private Integer superviseFlag;
 
 
 }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java

@@ -184,46 +184,46 @@ public class CorpInfoDO extends BaseDO {
     private LocalDate licenseEnd;
     //有无职业卫生信息,1:是,0:否
     @ApiModelProperty(value = "有无职业卫生信息,1:是,0:否")
-    private Integer whetherHygiene;
+    private Integer whetherHygieneFlag;
     //有无重大危险源,1:是,0:否
     @ApiModelProperty(value = "有无重大危险源,1:是,0:否")
-    private Integer whetherHazards;
+    private Integer whetherHazardsFlag;
     //是否有稀缺大型应急物资或设施,1:是,0:否
     @ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,0:否")
-    private Integer whetherScarce;
+    private Integer whetherScarceFlag;
     //是否涉及危化品,1:是,0:否
     @ApiModelProperty(value = "是否涉及危化品,1:是,0:否")
-    private Integer whetherChemicals;
+    private Integer whetherChemicalsFlag;
     //有无特种设备,1:是,0:否
     @ApiModelProperty(value = "有无特种设备,1:是,0:否")
-    private Integer whetherSpecialequipment;
+    private Integer whetherSpecialequipmentFlag;
     //有无特存种作业人员,1:是,0:否
     @ApiModelProperty(value = "有无特存种作业人员,1:是,0:否")
-    private Integer whetherSpecialpeople;
+    private Integer whetherSpecialpeopleFlag;
     //是否涉及煤气,1:是,0:否
     @ApiModelProperty(value = "是否涉及煤气,1:是,0:否")
-    private Integer whetherCoalgas;
+    private Integer whetherCoalgasFlag;
     //是否属于消防重点单位,1:是,0:否
     @ApiModelProperty(value = "是否属于消防重点单位,1:是,0:否")
-    private Integer whetherFire;
+    private Integer whetherFireFlag;
     //是否在有限空间作业,1:是,0:否
     @ApiModelProperty(value = "是否在有限空间作业,1:是,0:否")
-    private Integer whetherConfined;
+    private Integer whetherConfinedFlag;
     //是否存在涉爆粉尘作业,1:是,0:否
     @ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,0:否")
-    private Integer whetherPowder;
+    private Integer whetherPowderFlag;
     //是否涉及防雷防静电,1:是,0:否
     @ApiModelProperty(value = "是否涉及防雷防静电,1:是,0:否")
-    private Integer whetherLightning;
+    private Integer whetherLightningFlag;
     //是否涉及危化品管道,1:是,0:否
     @ApiModelProperty(value = "是否涉及危化品管道,1:是,0:否")
-    private Integer whetherPipeline;
+    private Integer whetherPipelineFlag;
     //是否持有放射源,1:是,0:否
     @ApiModelProperty(value = "是否持有放射源,1:是,0:否")
-    private Integer whetherActinogen;
+    private Integer whetherActinogenFlag;
     //是否涉及液氨制冷,1:是,0:否
     @ApiModelProperty(value = "是否涉及液氨制冷,1:是,0:否")
-    private Integer whetherLiquidammonia;
+    private Integer whetherLiquidammoniaFlag;
     //乐观锁
     @ApiModelProperty(value = "乐观锁")
     private Integer version;

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java

@@ -44,7 +44,7 @@ public class DepartmentDO extends BaseDO {
     private Integer depOrder;
     //是否监管部门 0-否  1-是
     @ApiModelProperty(value = "是否监管部门 0-否  1-是")
-    private Integer isSupervise;
+    private Integer superviseFlag;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java

@@ -13,10 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @Date 2025-10-29 16:02:16
  */
 @Mapper
-@DataScopes({
-        @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"),
-        @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id")
-})
 public interface CorpInfoMapper extends BaseMapper<CorpInfoDO> {
 
 }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java

@@ -13,10 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @Date 2025-10-29 16:02:46
  */
 @Mapper
-@DataScopes({
-        @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"),
-        @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id")
-})
 public interface CorpQualificationInfoMapper extends BaseMapper<CorpQualificationInfoDO> {
 
 }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java

@@ -13,10 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @Date 2025-10-29 16:03:20
  */
 @Mapper
-@DataScopes({
-        @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"),
-        @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id")
-})
 public interface DepartmentMapper extends BaseMapper<DepartmentDO> {
 
 }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java

@@ -46,6 +46,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
         SSOUser ssoUser = AuthContext.getCurrentUser();
+        queryWrapper.eq("tenant_id",ssoUser.getTenantId());
         queryWrapper.orderByDesc("dep_order");
         List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
         if (CollUtil.isEmpty(departmentDOList)) {