Kaynağa Gözat

修改禅道bug

liubo 2 yıl önce
ebeveyn
işleme
baaf63f6ea

+ 2 - 0
zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetServiceImpl.java

@@ -312,6 +312,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
                 hxpCabinetlockLog.setUnLockTime(DateUtils.getNowDate());
                 hxpCabinetlockLog.setOperationType(aioCabinetLockVo.getLockType().getCode());
                 hxpCabinetlockLog.setCreateTime(DateUtils.getNowDate());
+                hxpCabinetlockLog.setUserIds(SecurityUtils.getUserId()+ "");
                 hxpCabinetlockLog.setCreateBy(SecurityUtils.getUsername());
                 cabinetlockLogService.insertHxpCabinetlockLog(hxpCabinetlockLog);
 
@@ -401,6 +402,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
                 hxpCabinetlockLog.setUnLockTime(DateUtils.getNowDate());
                 hxpCabinetlockLog.setOperationType(aioCabinetLockVo.getLockType().getCode());
                 hxpCabinetlockLog.setCreateTime(DateUtils.getNowDate());
+                hxpCabinetlockLog.setUserIds(SecurityUtils.getUserId()+ "");
                 hxpCabinetlockLog.setCreateBy(SecurityUtils.getUsername());
                 cabinetlockLogService.insertHxpCabinetlockLog(hxpCabinetlockLog);
             }else if(success){

+ 2 - 1
zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpCabinetlockLogMapper.xml

@@ -61,7 +61,7 @@
         case when cl.operation_type = 2 then '出库' else
         case when cl.operation_type = 3 then '领用' else
         case when cl.operation_type = 4 then '归还' else
-        case when cl.operation_type = 5 then '系统' else
+        case when cl.operation_type = 0 then '系统' else
         '系统'
         end
         end
@@ -98,6 +98,7 @@
                 and cl.operation_type = #{operationType}
             </if>
         </where>
+        order by cl.un_lock_time desc
     </select>
 
     <select id="getListByIds" resultMap="HxpCabinetlockLogResult">