fix(controller):修复健康审批列表遍历对象错误- 修正 CBPSHomeDataController 中错误的环境审批列表遍历逻辑

- 更新 TFireAnnihilatorController 导出文件名以匹配实际内容
- 使用 DataFormatter 替代自定义方法以提高 TPssrSafetyBrustController 单元格值读取准确性- 在前端界面中为消防设备检查记录添加确认人列
- 调整组织架构显示条件以准确反映用户权限层级

master/src/main/java/com/ruoyi/project/common/controller/CBPSHomeDataController.java

@@ -105,7 +105,7 @@ public class CBPSHomeDataController extends BaseController {
 
         List<THealthapproval> healthList = tHealthapprovalService.selectTHealthapprovalList(new THealthapproval());
         int healthWarnNum = 0;
-        for (TEnvironapproval t: envList
+        for (THealthapproval t: healthList
         ) {
             if (t.getNextreviewdate() != null) {
                 long now = System.currentTimeMillis();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAnnihilatorController.java

@@ -280,7 +280,7 @@ public class TFireAnnihilatorController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
         //返回
-        String fileName = "PSSR_13_消气防设施_手提式、小推车式灭火器、灭火器材箱检查记录.xlsx";
+        String fileName = "PSSR_13_消气防设施_灭火器材检查记录.xlsx";
         OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
         workbook.write(os);
         workbook.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -105,7 +105,8 @@ public class TPssrSafetyBrustController extends BaseController {
                 entity.setApproveStatus(0L);
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
-                    String cellValue = ExcelUtils.getCellValue(cell);
+                    DataFormatter formatter = new DataFormatter();
+                    String cellValue = formatter.formatCellValue(cell);
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
                         entity.setUnit(cellValue);

ui/src/views/patrol/fire/annihilator/index.vue

@@ -149,6 +149,7 @@
           <dict-tag :options="dict.type.inspection_status" :value="scope.row.anniSafe"/>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="确认人" prop="confirmed"/>
       <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
         <template slot-scope="scope">
           <el-button

ui/src/views/plant/organization/index.vue

@@ -686,7 +686,7 @@ export default {
           console.log('安全专员')
           item.secretary = null
         }
-        if(this.$store.state.user.homeType == 5 || this.$store.state.user.homeType == 6) { //合成器，LDPE生产主管和工程师再一个位置
+        if(this.$store.state.user.homeType == 5 ) { //合成器生产主管和工程师再一个位置
           if (item.pId !== 0 && map[item.pId]) {
             // map[item.pId].children ? map[item.pId].children.push(item) : map[item.pId].children = [item];
             if (item.post == '装置经理' || item.post == '安全专员' || item.post == '首席专家') {