增加经营数据状态

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/DepartmentRepository.java

@@ -14,7 +14,7 @@ public interface DepartmentRepository extends BasicRepository<Department> {
 
     List<Department> findByStatusOrderBySortDesc(BaseStatusEnum status);
 
-    @Query(value = "select * from department where status = 0 and id not in ('12345','123456','1234567') order by path, code", nativeQuery = true)
+    @Query(value = "select * from department where status = 0 and id not in ('12345','123456','1234567', '12345678') order by path, code", nativeQuery = true)
     List<Department> findSelect();
 
     Department findByName(String name);

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.efunbox.manage.base.service.impl;
 
 import cn.efunbox.manage.base.entity.*;
+import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.base.enums.IncomeStatusEnum;
 import cn.efunbox.manage.base.repository.*;
 import cn.efunbox.manage.base.service.ManageService;
@@ -48,7 +49,9 @@ public class ManageServiceImpl implements ManageService {
     @Override
     public ApiResult list(ManageVO manageVO) {
         Pageable pageable = new PageRequest(manageVO.getPageNo() - 1,manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);}}));
+//        manageVO.setStatus(BaseStatusEnum.NORMAL);
         if(manageVO.getIsEntry()){
+            manageVO.setStatus(BaseStatusEnum.NORMAL);
             pageable = new PageRequest(manageVO.getPageNo() - 1, manageVO.getPageSize(), SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
         }
         Specification specification = (Specification<Manage>) (root, criteriaQuery, criteriaBuilder) -> {