新增事故添加后列表不显示问题

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/accident/model/req/AccidentReportQueryReq.java

@@ -42,6 +42,9 @@ public class AccidentReportQueryReq {
 	@ApiModelProperty(value = "基层单位id")
 	private String basicUnitId;
 
+	@ApiModelProperty(value = "组织id")
+	private String orgId;
+
 	@ApiModelProperty(value = "事故等级")
 	private String accidentLevel;
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/accident/model/resp/ReportUnitResp.java

@@ -55,6 +55,10 @@ public class ReportUnitResp {
     @ApiModelProperty(value = "子部门层级名称（不包含一级机构）")
     private String subSectorPathIds;
 
+    @ApiModelProperty(value = "组织机构id")
+    private String orgId;
+
+
 //    @ApiModelProperty(value = "第三层单位，如果与基层单位相同则不存数据")
 //    private String lastUnitId;
 //

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/accident/service/impl/AccidentReportServiceImpl.java

@@ -694,8 +694,11 @@ public class AccidentReportServiceImpl extends SuperServiceImpl<AccidentReportDa
         //权限控制
         ReportUnitResp reportUnit = this.getReportUnit();
 
-        if (StringUtils.isNotEmpty(reportUnit.getBasicUnitId())) {
+        /*if (StringUtils.isNotEmpty(reportUnit.getBasicUnitId())) {
             param.setBasicUnitId(reportUnit.getBasicUnitId());
+        }*/
+        if (StringUtils.isNotEmpty(reportUnit.getOrgId())) {
+            param.setOrgId(reportUnit.getBasicUnitId());
         }
         if (StringUtils.isNotEmpty(reportUnit.getRegionalCompanyId())) {
             param.setRegionalCompanyId(reportUnit.getRegionalCompanyId());
@@ -936,8 +939,8 @@ public class AccidentReportServiceImpl extends SuperServiceImpl<AccidentReportDa
         if (org.apache.commons.lang.StringUtils.isNotBlank(queryParam.getRegionalCompanyId())) {
             queryWrapper.eq(AccidentReport.REGIONAL_COMPANY_ID, queryParam.getRegionalCompanyId());
         }
-        if (org.apache.commons.lang.StringUtils.isNotBlank(queryParam.getBasicUnitId())) {
-            queryWrapper.eq(AccidentReport.BASIC_UNIT_ID, queryParam.getBasicUnitId());
+        if (org.apache.commons.lang.StringUtils.isNotBlank(queryParam.getBasicUnitId()) || org.apache.commons.lang.StringUtils.isNotBlank(queryParam.getOrgId())) {
+            queryWrapper.or().eq(AccidentReport.BASIC_UNIT_ID, queryParam.getBasicUnitId()).or().eq(AccidentReport.ORG_ID, queryParam.getOrgId());
         }
         if (org.apache.commons.lang.StringUtils.isNotBlank(queryParam.getProcessStatus())) {
             queryWrapper.eq(AccidentReport.PROCESS_STATUS, queryParam.getProcessStatus());

zlmy-modules/zlmy-boot/src/main/resources/mapper/accident/AccidentReport.xml

@@ -27,6 +27,7 @@
         <id column="group_risk" property="groupRisk"/>
         <id column="dangerous_homework_category" property="dangerousHomeworkCategory"/>
         <id column="injured_area" property="injuredArea"/>
+        <id column="remarks" property="remarks"/>
     </resultMap>
 
     <!--<select id="getCountByAccidentTime" parameterType="com.testor.module.accident.model.domain.AccidentReport" resultType="string">-->