林武泰/优化空数据返回

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetBorrowRecordServiceImpl.java

@@ -230,7 +230,7 @@ public class TbAssetBorrowRecordServiceImpl extends ServiceImpl<TbAssetBorrowRec
     public List<TbAssetBorrowRecord> selectMeTbAssetBorrowRecord(Long status) {
         Long loginUserId = UserUtils.getLoginUserId();
         QueryWrapper<TbAssetBorrowRecord> borrowRecordQueryWrapper = new QueryWrapper<>();
-        borrowRecordQueryWrapper.eq("user_id", loginUserId).orderByDesc("borrow_date");
+        borrowRecordQueryWrapper.eq("user_id", loginUserId).orderByAsc("isReturn").orderByDesc("borrow_date");
         if (status != null) {
             if (status < 0 || status > 1) {
                 status = 0L;

lab-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Collections;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -94,7 +95,7 @@ public class SysNoticeController extends BaseController
         }
         List<SysNotice> sysNoticeList = noticeService.selectNewNotice(number);
         if (sysNoticeList.isEmpty()) {
-            return error("暂无公告");
+            return AjaxResult.success("暂无公告", Collections.emptyList());
         }
         if (number == 1) {
             SysNotice sysNotice = sysNoticeList.get(0);
@@ -115,7 +116,7 @@ public class SysNoticeController extends BaseController
         }
         List<SysNotice> sysNoticeList = noticeService.selectNewInform(number);
         if (sysNoticeList.isEmpty()) {
-            return error("暂无通知");
+            return AjaxResult.success("暂无通知", Collections.emptyList());
         }
         if (number == 1) {
             SysNotice sysNotice = sysNoticeList.get(0);

lab-admin/src/main/resources/mapper/asset/TbFaultReportMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="assetBarCode != null  and assetBarCode != ''"> and asset_bar_code = #{assetBarCode}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="reportDate != null "> and report_date = #{reportDate}</if>
+            <if test="reportDate != null "> and report_date like concat('%', DATE_FORMAT(#{reportDate}, '%Y-%m-%d'), '%')</if>
             <if test="faultPhenomenon != null  and faultPhenomenon != ''"> and fault_phenomenon = #{faultPhenomenon}</if>
             <if test="processState != null "> and process_state = #{processState}</if>
         </where>
+        order by process_state, report_date DESC
     </select>
     
     <select id="selectTbFaultReportById" parameterType="Long" resultMap="TbFaultReportResult">

lab-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -6,6 +6,8 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -20,9 +22,11 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long deptId;
 
     /** 父部门ID */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long parentId;
 
     /** 祖级列表 */

lab-ui/src/views/asset/asset/index.vue

@@ -564,7 +564,7 @@ export default {
     getDeptName(id) {
       let name = ''
       this.deptList.forEach(dept => {
-        if (dept.id === id) {
+        if (String(dept.id) === id) {
           name = dept.label
           return
         }
@@ -576,19 +576,16 @@ export default {
     },
     filterDept(deptChildren, id) {
       let name = ''
-      let isFind = false
       deptChildren.forEach(dept => {
-        if (dept.id === id) {
+        if (String(dept.id) === id) {
           name = dept.label
-          isFind = true
+          return name
         }
         if (dept.children != null) {
-          this.filterDept(dept.children, id)
+          name = this.filterDept(dept.children, id)
         }
       })
-      if (isFind) {
-        return name
-      }
+      return name
     },
     // 取消按钮
     cancel() {
@@ -656,6 +653,12 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        const dept = this.form.deptId
+        if (dept.length <= 0 || dept == null) {
+          this.form.deptId = null
+        } else {
+          this.form.deptId = dept[dept.length-1]
+        }
         if (valid) {
           if (this.form.id != null) {
             updateAsset(this.form).then(response => {