风险信息 部门0，列表数据标签bug

danger-manage-system/src/main/java/com/zehong/system/domain/TRiskManager.java

@@ -6,10 +6,10 @@ import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
 /**
- * 【请填写功能名称】对象 t_risk_manager
+ * 风险信息对象 t_risk_manager
  *
  * @author zehong
- * @date 2022-07-01
+ * @date 2022-11-24
  */
 public class TRiskManager extends BaseEntity
 {
@@ -40,7 +40,7 @@ public class TRiskManager extends BaseEntity
 
     /** 责任部门 */
     @Excel(name = "责任部门")
-    private int riskDept;
+    private Long riskDept;
 
     /** 责任人 */
     @Excel(name = "责任人")
@@ -100,12 +100,12 @@ public class TRiskManager extends BaseEntity
     {
         return riskControl;
     }
-    public void setRiskDept(int riskDept)
+    public void setRiskDept(Long riskDept)
     {
         this.riskDept = riskDept;
     }
 
-    public int getRiskDept()
+    public Long getRiskDept()
     {
         return riskDept;
     }

danger-manage-system/src/main/resources/mapper/system/TRiskManagerMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="riskLevel != null  and riskLevel != ''"> and risk_level = #{riskLevel}</if>
             <if test="riskType != null  and riskType != ''"> and risk_type = #{riskType}</if>
             <if test="riskControl != null  and riskControl != ''"> and risk_control = #{riskControl}</if>
-            <if test="riskDept != null  and riskDept != ''"> and risk_dept = #{riskDept}</if>
+            <if test="riskDept != null"> and risk_dept = #{riskDept}</if>
             <if test="riskPerson != null  and riskPerson != ''"> and risk_person = #{riskPerson}</if>
         </where>
     </select>

danger-manage-web/src/views/riskManager/riskMsg/index.vue

@@ -104,7 +104,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号"  width="55" align="center" prop="id" />
       <el-table-column label="辨识部位" width="135"  align="center" prop="riskPart" />
-      <el-table-column label="存在风险" align="center" prop="riskContent" />
+      <el-table-column label="存在风险" align="center" prop="riskContent" >
+        <template slot-scope="scope">
+          <dl v-html="scope.row.riskContent">
+            {{scope.row.riskContent}}
+          </dl>
+        </template>
+      </el-table-column>
       <el-table-column label="风险等级" width="75" align="center" prop="riskLevel" :formatter="riskLevelFormat"/>
       <el-table-column label="事故类型" width="95" align="center" prop="riskType" :formatter="riskTypeFormat"/>
       <el-table-column label="管控措施" align="center" prop="riskControl" />
@@ -240,6 +246,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        riskPart: [
+          { required: true, message: "辨识部位不能为空", trigger: "blur" }
+        ],
+        riskDept: [
+          { required: true, message: "责任部门不能为空", trigger: "blur" }
+        ],
       }
     };
   },