风险信息 部门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,81 +40,81 @@ public class TRiskManager extends BaseEntity
 
     /** 责任部门 */
     @Excel(name = "责任部门")
-    private int riskDept;
+    private Long riskDept;
 
     /** 责任人 */
     @Excel(name = "责任人")
     private String riskPerson;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setRiskPart(String riskPart) 
+    public void setRiskPart(String riskPart)
     {
         this.riskPart = riskPart;
     }
 
-    public String getRiskPart() 
+    public String getRiskPart()
     {
         return riskPart;
     }
-    public void setRiskContent(String riskContent) 
+    public void setRiskContent(String riskContent)
     {
         this.riskContent = riskContent;
     }
 
-    public String getRiskContent() 
+    public String getRiskContent()
     {
         return riskContent;
     }
-    public void setRiskLevel(String riskLevel) 
+    public void setRiskLevel(String riskLevel)
     {
         this.riskLevel = riskLevel;
     }
 
-    public String getRiskLevel() 
+    public String getRiskLevel()
     {
         return riskLevel;
     }
-    public void setRiskType(String riskType) 
+    public void setRiskType(String riskType)
     {
         this.riskType = riskType;
     }
 
-    public String getRiskType() 
+    public String getRiskType()
     {
         return riskType;
     }
-    public void setRiskControl(String riskControl) 
+    public void setRiskControl(String riskControl)
     {
         this.riskControl = riskControl;
     }
 
-    public String getRiskControl() 
+    public String getRiskControl()
     {
         return riskControl;
     }
-    public void setRiskDept(int riskDept)
+    public void setRiskDept(Long riskDept)
     {
         this.riskDept = riskDept;
     }
 
-    public int getRiskDept()
+    public Long getRiskDept()
     {
         return riskDept;
     }
-    public void setRiskPerson(String riskPerson) 
+    public void setRiskPerson(String riskPerson)
     {
         this.riskPerson = riskPerson;
     }
 
-    public String getRiskPerson() 
+    public String getRiskPerson()
     {
         return riskPerson;
     }
@@ -122,14 +122,14 @@ public class TRiskManager extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("riskPart", getRiskPart())
-            .append("riskContent", getRiskContent())
-            .append("riskLevel", getRiskLevel())
-            .append("riskType", getRiskType())
-            .append("riskControl", getRiskControl())
-            .append("riskDept", getRiskDept())
-            .append("riskPerson", getRiskPerson())
-            .toString();
+                .append("id", getId())
+                .append("riskPart", getRiskPart())
+                .append("riskContent", getRiskContent())
+                .append("riskLevel", getRiskLevel())
+                .append("riskType", getRiskType())
+                .append("riskControl", getRiskControl())
+                .append("riskDept", getRiskDept())
+                .append("riskPerson", getRiskPerson())
+                .toString();
     }
 }

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TRiskManagerMapper">
-    
+
     <resultMap type="TRiskManager" id="TRiskManagerResult">
         <result property="id"    column="id"    />
         <result property="riskPart"    column="risk_part"    />
@@ -21,22 +21,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTRiskManagerList" parameterType="TRiskManager" resultMap="TRiskManagerResult">
         <include refid="selectTRiskManagerVo"/>
-        <where>  
+        <where>
             <if test="riskPart != null  and riskPart != ''"> and risk_part LIKE concat('%',#{riskPart},'%')</if>
             <if test="riskContent != null  and riskContent != ''"> and risk_content = #{riskContent}</if>
             <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>
-    
+
     <select id="selectTRiskManagerById" parameterType="Long" resultMap="TRiskManagerResult">
         <include refid="selectTRiskManagerVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTRiskManager" parameterType="TRiskManager" useGeneratedKeys="true" keyProperty="id">
         insert into t_risk_manager
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTRiskManagerByIds" parameterType="String">
-        delete from t_risk_manager where id in 
+        delete from t_risk_manager where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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" }
+        ],
       }
     };
   },