优化常见问题删除逻辑

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -46,6 +46,7 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 0L, req.getMtCompanyId())
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
+                        .eq("status",2)
                         .orderByDesc("mt_company_id")
         );
         if (page.getRecords().isEmpty()) {
@@ -73,11 +74,9 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 0L, request.getMtCompanyId())
                         .in(request.getType() != null, "type", type(request))
                         .eq(request.getLiftType() != null, "lift_type", request.getLiftType())
+                        .eq("status",2)
                         .in(sort != null, "sort", sort)
         );
-        if (options.isEmpty()) {
-            return RestResponse.success();
-        }
         return RestResponse.success(options);
     }
 

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/controller/RegionController.java

@@ -2,14 +2,14 @@ package cn.com.ty.lift.enterprise.region.controller;
 
 import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import cn.com.ty.lift.enterprise.region.dao.entity.model.RegionReq;
-import cn.com.ty.lift.enterprise.region.dao.mapper.RegionMapper;
 import cn.com.ty.lift.enterprise.region.service.RegionService;
-import cn.com.ty.lift.enterprise.region.service.impl.RegionServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/entity/model/RegionReq.java

@@ -3,8 +3,6 @@ package cn.com.ty.lift.enterprise.region.dao.entity.model;
 import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/service/impl/FaqServiceImpl.java

@@ -62,7 +62,7 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
      * @return 操作结果
      */
     public RestResponse delete(Long id) {
-        List<Faq> faqs = this.list(new QueryWrapper<Faq>().select("id", "parent_id"));
+        List<Faq> faqs = this.list(new QueryWrapper<Faq>().select("id", "parent_id","serial"));
         removeFaqs(id, faqs);
         List<Long> ids = faqs.stream()
                 //保留序号为-1的记录