111

k94314517

2023-09-18 2359a38efc2a90a2776e2a45afcecda1fb0065a3

111

 server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java

@@ -416,6 +416,7 @@
                wTransferDetail.setTransferId(wTransfer.getId());
                wTransferDetail.setOutDepartId(wTransfer.getOutDepartId());
                wTransferDetail.setOutWarehouseId(wTransfer.getOutWarehouseId());
                wTransferDetail.setOutLocationId(w.getOutLocationId());
                wTransferDetail.setInDepartId(wTransfer.getInDepartId());
                wTransferDetail.setInWarehouseId(wTransfer.getInWarehouseId());
                wTransferDetail.setInLcoationId(w.getInLocationId());

 server/src/main/resources/mappers/SystemUserMapper.xml

@@ -97,10 +97,11 @@
    FROM `system_login_log` s left join company c on s.COMPANY_ID = c.ID
    <where>
      s.COMPANY_ID is not null
      and s.SUCCESS = 1
      and s.ORGIN is not null
      <if test="dto.orgin != null">
        AND s.orgin = #{dto.orgin}
      </if>

      <if test="dto.companyName != null and dto.companyName != ''">
        AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
      </if>