Jelajahi Sumber

LY 工作票bug fix

ly 2 tahun lalu
induk
melakukan
51f6d57055

+ 0 - 1
master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -254,7 +254,6 @@ public class TJobticketController extends BaseController
         if(tJobticket.getUserMg()!=null){
             SysUser sysUser =sysUserService.selectUserById(tJobticket.getUserMg());
             contentUserUnit.append(sysUser.getNickName());
-
         }
         tJobticket.setByclxr(contentUserUnit.toString());
         tJobticket.setUpdaterCode(getUserId().toString());

+ 1 - 1
master/src/main/resources/mybatis/ehs/TJobticketMapper.xml

@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hpjb != null">hpjb = #{hpjb},</if>
             <if test="xzkjxkzh != null">xzkjxkzh = #{xzkjxkzh},</if>
             <if test="content != null">content = #{content},</if>
-            <if test="byclxr != null">byclxr = #{byclxr},</if>
+            <if test="byclxr != null and byclxr != ''">byclxr = #{byclxr},</if>
             <if test="sgdw != null">sgdw = #{sgdw},</if>
             <if test="lxr != null">lxr = #{lxr},</if>
             <if test="lxdh != null">lxdh = #{lxdh},</if>

File diff ditekan karena terlalu besar
+ 342 - 320
ui/src/views/ehs/jobticket/index.vue


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini