From 32f319e7682dd368078ba6fed04c1dc72d897469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 19 Apr 2022 09:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupController.java | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 8e1a1385..ec589851 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -1,18 +1,12 @@
 package com.jero.project.controller;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.common.RoleCommon;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.base.controller.JeroController;
@@ -23,13 +17,14 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.*;
+import com.jero.project.entity.PayWorkingGroup;
+import com.jero.project.entity.PayWorkingGroupSubItem;
+import com.jero.project.service.IPayWorkingGroupService;
+import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.project.vo.PayWorkingGroupPayment;
 import com.jero.project.vo.PayWorkingGroupVO;
-import com.jero.project.service.IPayWorkingGroupService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.project.service.IPayWorkingGroupSubItemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -37,8 +32,15 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
  /**
  * @Description: 工作组项目
@@ -59,7 +61,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	private IPayIncomeContractService payIncomeContractService;
 	@Resource
 	private RolePermissionService rolePermissionService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -256,7 +258,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		 payWorkingGroupService.copy(payWorkingGroup);
 		 return Result.OK("复制成功！");
 	 }
-	
+
 	/**
 	 *   添加
 	 *
@@ -289,7 +291,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		payWorkingGroupService.save(payWorkingGroup);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -370,7 +372,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		payWorkingGroupService.deleteById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -393,7 +395,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 		payWorkingGroupService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *