关联配置时房间号丢失问题处理

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -48,7 +48,7 @@ public class LabSubject extends BaseEntity implements QCInterface {
      */
     @ApiModelProperty("实验室房间号")
     @Excel(name = "实验室房间号")
-    private String room = "";
+    private String room;
 
     private String roomName = "";
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -639,9 +639,9 @@
     <update id="updateLabSubject" parameterType="com.zd.laboratory.domain.LabSubject">
         update lab_subject
         <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
+            <if test="name != null and name!=''">name = #{name},</if>
             <if test="floorId != null">floor_id = #{floorId},</if>
-            <if test="room != null">room = #{room},</if>
+            <if test="room != null and room !=''">room = #{room},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="adminId != null">admin_id = #{adminId},</if>