危险作业单位查询

zlmy-modules/zlmy-boot/doc/国产化/上线说明.md

@@ -107,7 +107,11 @@ SELECT TABLE_NAME AS view_name  FROM information_schema.views  WHERE TABLE_SCHEM
 | act_id_user       |
 +-------------------+
 
- 
 
 
-   
+
+
+
+# 下次上线(标记于20250710)
+ALTER TABLE public.t_accident_report ALTER COLUMN report_unit TYPE varchar(1000) USING report_unit::varchar;
+ALTER TABLE public.t_accident_report ALTER COLUMN attachment TYPE varchar(1000) USING attachment::varchar;
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -243,7 +243,9 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         Page<THazardWorkPlan> resultPage = new Page<>(page, limit);
         // TODO 根据需求修改查询条件及查询参数
         // 默认orgId为当前用户的id
-        param.setOrgId(ContextUtils.getLoginUser().getOrgId());
+        if(StringUtils.isEmpty(param.getOrgId())){
+            param.setOrgId(ContextUtils.getLoginUser().getOrgId());
+        }
         QueryWrapper<THazardWorkPlan> queryWrapper = this.createQuery(param);
         Page<THazardWorkPlan> tHazardWorkPlanPage = this.page(resultPage, queryWrapper);
         List<THazardWorkPlan> records = tHazardWorkPlanPage.getRecords();