bugfix

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

@@ -17,4 +17,5 @@ public interface DepartmentRepository extends BasicRepository<Department> {
     @Query(value = "select * from department where status = 0 and id not in ('12345','123456','1234567') 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/repository/ProductRepository.java

@@ -13,4 +13,6 @@ public interface ProductRepository extends BasicRepository<Product> {
 
     Product findById(String id);
 
+    Product findByName(String name);
+
 }

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

@@ -52,7 +52,8 @@ public class CostTypeServiceImpl implements CostTypeService {
         if(costType == null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
-        if(Objects.nonNull(costTypeRepository.findByName(costType.getName()))){
+        CostType oldCostType = costTypeRepository.findByName(costType.getName());
+        if(!Objects.equals(oldCostType.getId(), costType.getId())){
             return ApiResult.error(ApiCode.REPETITION_ERROR);
         }
         costType = costTypeRepository.update(costType);

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

@@ -59,6 +59,10 @@ public class DepartmentServiceImpl implements DepartmentService {
         if(department ==null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
+        Department oldDepartment = departmentRepository.findByName(department.getName());
+        if(!Objects.equals(oldDepartment.getId(), department.getId())){
+            return ApiResult.error(ApiCode.REPETITION_ERROR);
+        }
         department = departmentRepository.update(department);
         if(Objects.nonNull(department)){
             return ApiResult.ok(department);

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

@@ -57,7 +57,10 @@ public class ManageServiceImpl implements ManageService {
 
     @Override
     public ApiResult list(ManageVO manageVO, Integer pageNo, Integer pageSize) {
-        Pageable pageable = new PageRequest(pageNo - 1, pageSize, SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);put("gmtModified", BaseOrderEnum.DESC);}}));
+        Pageable pageable = new PageRequest(pageNo - 1, pageSize, SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("happenTime", BaseOrderEnum.DESC);}}));
+        if(manageVO.getIsEntry()){
+            pageable = new PageRequest(pageNo - 1, pageSize, SortHelper.sortMap2Sort(new LinkedHashMap<String, BaseOrderEnum>(){{put("gmtModified", BaseOrderEnum.DESC);}}));
+        }
         Specification specification = new Specification<Manage>() {
             @Override
             public Predicate toPredicate(Root<Manage> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {

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

@@ -57,6 +57,10 @@ public class ProductServiceImpl implements ProductService {
         if(product ==null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
+        Product oldProduct = productRepository.findByName(product.getName());
+        if(!Objects.equals(oldProduct.getId(), product.getId())){
+            return ApiResult.error(ApiCode.REPETITION_ERROR);
+        }
         product = productRepository.update(product);
         if(Objects.nonNull(product)){
             return ApiResult.ok(product);

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

@@ -55,7 +55,8 @@ public class ProjectServiceImpl implements ProjectService {
         if(project ==null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
-        if(Objects.nonNull(projectRepository.findByName(project.getName()))){
+        Project oldProject = projectRepository.findByName(project.getName());
+        if(!Objects.equals(oldProject.getId(), project.getId())){
             return ApiResult.error(ApiCode.REPETITION_ERROR);
         }
         project = projectRepository.update(project);

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/vo/ManageVO.java

@@ -3,6 +3,7 @@ package cn.efunbox.manage.base.vo;
 import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.base.enums.IncomeStatusEnum;
 import cn.efunbox.manage.base.enums.ManageTypeEnum;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -48,4 +49,6 @@ public class ManageVO implements Serializable {
     private Double maxAmount;
 
     private List<Long> deptIds;
+
+    private Boolean isEntry;
 }