Przeglądaj źródła

部门搜索修改

anderx 3 lat temu
rodzic
commit
81728d9f83
32 zmienionych plików z 405 dodań i 230 usunięć
  1. 4 6
      src/main/java/com/goafanti/admin/service/DepartmentService.java
  2. 1 1
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  3. 3 18
      src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java
  4. 4 4
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  5. 4 4
      src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml
  6. 4 4
      src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml
  7. 4 4
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  8. 4 4
      src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml
  9. 4 4
      src/main/java/com/goafanti/common/mapper/UserMidMapper.xml
  10. 13 9
      src/main/java/com/goafanti/order/bo/InputArrearsDunListBo.java
  11. 7 5
      src/main/java/com/goafanti/order/bo/InputMemberList.java
  12. 9 5
      src/main/java/com/goafanti/order/bo/InputOrderInvoiceBo.java
  13. 186 0
      src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java
  14. 7 5
      src/main/java/com/goafanti/order/bo/InputSignStatistics.java
  15. 9 5
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  16. 2 7
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  17. 7 6
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  18. 2 2
      src/main/java/com/goafanti/order/service/OrderChangeService.java
  19. 1 10
      src/main/java/com/goafanti/order/service/OrderNewService.java
  20. 2 2
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  21. 8 8
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  22. 2 2
      src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java
  23. 65 66
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  24. 2 2
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  25. 2 7
      src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java
  26. 17 12
      src/main/java/com/goafanti/organization/bo/InputPaymentList.java
  27. 2 2
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  28. 2 2
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java
  29. 15 13
      src/main/java/com/goafanti/patent/bo/PatentNewBo.java
  30. 4 4
      src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java
  31. 7 5
      src/main/java/com/goafanti/user/bo/InputUserFollowList.java
  32. 2 2
      src/main/java/com/goafanti/user/service/impl/UserFollowServiceImpl.java

+ 4 - 6
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -33,14 +33,12 @@ public interface DepartmentService {
 
 	/**
 	 * 查出部门,及下级部门
-	 * @param subId 部门编号
-	 * @param type	 0=包含本部门,1不包含本部门
-	 * @param myShiro 0=正常,1=只看我相关部门
+	 * @param deps 部门集合
+
 	 */
-	List<String> selectSubDeps(List<String>  deps,Integer type,Integer myShiro);
-	List<String> selectSubDeps(List<String>  deps,Integer type);
 	List<String> selectSubDeps(List<String>  deps);
 
-	List<Department> getLowerDep(String depIds);
 
+
+	List<Department> selectSubordinateDeps(String depId);
 }

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -379,7 +379,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			acb.setName(oo.getName());
 			acb.setId(depId);
 			deps=departmentMapper.selectBysuperId(oo.getId());
-			depIds =departmentService.selectSubDeps(depId);
+			depIds =departmentService.selectSubordinateDeps(depId);
 		}
 		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
 		for (AdminCustomerBo ad : list) {

+ 3 - 18
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -69,38 +69,23 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	public List<String> selectMyDeps() {
 		return selectCurrentDep(TokenManager.getAdminId());
 	}
-	public List<String> selectSubDeps(List<String> deps) {
-		return selectSubDeps(deps,0);
-	}
 
-	@Override
-	public List<String> selectSubDeps(List<String> deps,Integer type) {
-		return selectSubDeps(deps,type,0);
-	}
 
 	@Override
-	public List<String> selectSubDeps(List<String>  deps,Integer type,Integer myShiro) {
+	public List<String> selectSubDeps(List<String>  deps) {
 			List<String> myAll=new ArrayList<>();
-		if (myShiro==1){
 			List<String> my=selectMyDeps();
 			for (String dep : deps) {
 				for (String dep2 : my) {
 					if (dep.equals(dep2))myAll.add(dep);
 				}
 			}
-
-		}
 		return myAll;
 	}
 
 	@Override
-	public List<Department> getLowerDep(String depIds) {
-		String[] ss=depIds.split(",");
-		List<Department> ls=new ArrayList<>();
-		Arrays.stream(ss).forEach(e ->{
-			ls.addAll(selectSubDeps(e));
-		});
-		return ls;
+	public 	List<Department> selectSubordinateDeps(String depId){
+		return departmentMapper.selectSubDeps(depId);
 	}
 
 

+ 4 - 4
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -514,8 +514,8 @@ select
 	</if>
 	<if test="deps !=null">
 	and b.order_dep in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
       </foreach>
 	</if>
 	<if test="salesmanName !=null">
@@ -624,8 +624,8 @@ select
 	</if>
     <if test="deps !=null">
       and b.order_dep in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
       </foreach>
     </if>
 	<if test="salesmanName !=null">

+ 4 - 4
src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml

@@ -480,13 +480,13 @@
 		<if test="inputDep != null">
 			and ia.department_id in
 			<foreach close=")" collection="inputDep" item="deps" open="(" separator=",">
-				#{deps.id}
+				#{deps}
 			</foreach>
 		</if>
 		<if test="followDep != null">
 			and b.department_id  in
 			<foreach close=")" collection="followDep" item="f" open="(" separator=",">
-				#{f.id}
+				#{f}
 			</foreach>
 		</if>
 		<if test="salesmanRemind !=null">
@@ -551,13 +551,13 @@
 		<if test="inputDep != null">
 			and ia.department_id in
 			<foreach close=")" collection="inputDep" item="deps" open="(" separator=",">
-				#{deps.id}
+				#{deps}
 			</foreach>
 		</if>
 		<if test="followDep != null">
 			and b.department_id  in
 			<foreach close=")" collection="followDep" item="f" open="(" separator=",">
-				#{f.id}
+				#{f}
 			</foreach>
 		</if>
 		<if test="salesmanRemind !=null">

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -668,8 +668,8 @@
 	</if>
 	<if test="deps !=null">
 	and b.order_dep in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
       </foreach>
 	</if>
 	<if test="status !=null">
@@ -717,8 +717,8 @@
 	</if>
     <if test="deps !=null">
       and b.order_dep in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
       </foreach>
     </if>
 	<if test="status !=null">

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -767,8 +767,8 @@
 	  	</if>
   		<if test="deps !=null">
 	  	and o.order_dep in
-          <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-            #{deps.id}
+          <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+            #{depId}
           </foreach>
 	  	</if>
 	  	<if test="o.contractNo != null and o.contractNo != &quot;&quot;">
@@ -847,8 +847,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	  	</if>
         <if test="deps !=null">
           and o.order_dep in
-          <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-            #{deps.id}
+          <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+            #{depId}
           </foreach>
         </if>
 	  	<if test="o.contractNo != null and o.contractNo != &quot;&quot;">

+ 4 - 4
src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml

@@ -318,8 +318,8 @@
 		</if>
         <if test="deps != null">
           and d.department_id in
-          <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-            #{deps.id}
+          <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+            #{depId}
           </foreach>
         </if>
 		order by  a.create_time desc
@@ -372,8 +372,8 @@
       </if>
       <if test="deps != null">
         and d.department_id in
-        <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-          #{deps.id}
+        <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+          #{depId}
         </foreach>
       </if>
 	</select>

+ 4 - 4
src/main/java/com/goafanti/common/mapper/UserMidMapper.xml

@@ -576,8 +576,8 @@
     </if>
     <if test="deps != null">
       and a.department_id in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
       </foreach>
     </if>
     <if test="amountType != null">
@@ -612,8 +612,8 @@
     </if>
     <if test="deps != null">
       and a.department_id in
-      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
-        #{deps.id}
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
       </foreach>
     </if>
     <if test="amountType != null">

+ 13 - 9
src/main/java/com/goafanti/order/bo/InputArrearsDunListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 
+import java.util.List;
+
 public class InputArrearsDunListBo {
 	private String name;
 	private String  orderNo;
@@ -9,7 +11,7 @@ public class InputArrearsDunListBo {
 	private String  tStarTime;
 	private String  tEndTime;
 	private String  adminName;
-	private String  depId;
+	private List<String>  deps;
 	private Integer pageNo;
 	private Integer pageSize;
 
@@ -45,20 +47,22 @@ public class InputArrearsDunListBo {
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
-	
+
 	public String getAdminName() {
 		return adminName;
 	}
 	public void setAdminName(String adminName) {
 		this.adminName = adminName;
 	}
-	public String getDepId() {
-		return depId;
+
+	public List<String> getDeps() {
+		return deps;
 	}
-	public void setDepId(String depId) {
-		this.depId = depId;
+
+	public void setDeps(List<String> deps) {
+		this.deps = deps;
 	}
-	
+
 	public Integer getPageNo() {
 		return pageNo;
 	}
@@ -83,7 +87,7 @@ public class InputArrearsDunListBo {
 	public void settEndTime(String tEndTime) {
 		this.tEndTime = tEndTime;
 	}
-	
-	
+
+
 
 }

+ 7 - 5
src/main/java/com/goafanti/order/bo/InputMemberList.java

@@ -1,9 +1,11 @@
 package com.goafanti.order.bo;
 
+import java.util.List;
+
 public class InputMemberList {
     private String orderNo;
     private String userName;
-    private String depId;
+    private List<String> deps;
     private String contractNo;
     private String salesmanId;
     private String projectName;
@@ -44,12 +46,12 @@ public class InputMemberList {
         this.userName = userName;
     }
 
-    public String getDepId() {
-        return depId;
+    public List<String> getDeps() {
+        return deps;
     }
 
-    public void setDepId(String depId) {
-        this.depId = depId;
+    public void setDeps(List<String> deps) {
+        this.deps = deps;
     }
 
     public String getContractNo() {

+ 9 - 5
src/main/java/com/goafanti/order/bo/InputOrderInvoiceBo.java

@@ -1,7 +1,9 @@
 package com.goafanti.order.bo;
 
+import java.util.List;
+
 public class InputOrderInvoiceBo {
-	private String orderDep;
+	private List<String> deps;
 	private String orderNo;
 	private String name;
 	private Integer type;
@@ -17,12 +19,14 @@ public class InputOrderInvoiceBo {
 		this.all = all;
 	}
 
-	public String getOrderDep() {
-		return orderDep;
+	public List<String> getDeps() {
+		return deps;
 	}
-	public void setOrderDep(String orderDep) {
-		this.orderDep = orderDep;
+
+	public void setDeps(List<String> deps) {
+		this.deps = deps;
 	}
+
 	public String getOrderNo() {
 		return orderNo;
 	}

+ 186 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -0,0 +1,186 @@
+package com.goafanti.order.bo;
+
+import java.util.List;
+
+public class InputOrderNewListBo {
+    private String aid;
+    private  String name;
+    private String orderNo;
+    private String starTime;
+    private String endTime;
+    private Integer specially;
+    private Integer approval;
+    private Integer distribution;
+    private List<String> deps;
+    private String contractNo;
+    private Integer outsource;
+    private Integer liquidationStatus;
+    private Integer amountStatus;
+    private String contractStart;
+    private String contractEnd;
+    private String uid;
+    private Integer projectType;
+    private Integer processStatus;
+    private  Integer pageNo;
+    private Integer pageSize;
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getStarTime() {
+        return starTime;
+    }
+
+    public void setStarTime(String starTime) {
+        this.starTime = starTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getSpecially() {
+        return specially;
+    }
+
+    public void setSpecially(Integer specially) {
+        this.specially = specially;
+    }
+
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    public Integer getDistribution() {
+        return distribution;
+    }
+
+    public void setDistribution(Integer distribution) {
+        this.distribution = distribution;
+    }
+
+    public List<String> getDeps() {
+        return deps;
+    }
+
+    public void setDeps(List<String> deps) {
+        this.deps = deps;
+    }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public Integer getOutsource() {
+        return outsource;
+    }
+
+    public void setOutsource(Integer outsource) {
+        this.outsource = outsource;
+    }
+
+    public Integer getLiquidationStatus() {
+        return liquidationStatus;
+    }
+
+    public void setLiquidationStatus(Integer liquidationStatus) {
+        this.liquidationStatus = liquidationStatus;
+    }
+
+    public Integer getAmountStatus() {
+        return amountStatus;
+    }
+
+    public void setAmountStatus(Integer amountStatus) {
+        this.amountStatus = amountStatus;
+    }
+
+    public String getContractStart() {
+        return contractStart;
+    }
+
+    public void setContractStart(String contractStart) {
+        this.contractStart = contractStart;
+    }
+
+    public String getContractEnd() {
+        return contractEnd;
+    }
+
+    public void setContractEnd(String contractEnd) {
+        this.contractEnd = contractEnd;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public Integer getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(Integer projectType) {
+        this.projectType = projectType;
+    }
+
+    public Integer getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

+ 7 - 5
src/main/java/com/goafanti/order/bo/InputSignStatistics.java

@@ -1,8 +1,10 @@
 package com.goafanti.order.bo;
 
+import java.util.List;
+
 public class InputSignStatistics {
 
-    private String depId;
+    private List<String> deps;
     private String aid;
     private String uid;
     private Integer amountType;
@@ -29,12 +31,12 @@ public class InputSignStatistics {
         this.orderType = orderType;
     }
 
-    public String getDepId() {
-        return depId;
+    public List<String> getDeps() {
+        return deps;
     }
 
-    public void setDepId(String depId) {
-        this.depId = depId;
+    public void setDeps(List<String> deps) {
+        this.deps = deps;
     }
 
     public String getAid() {

+ 9 - 5
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.order.bo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.goafanti.common.utils.excel.Excel;
 
@@ -97,7 +98,7 @@ public class OrderListBo {
 	/** 收款公司名称 **/
 	private String companyName;
 	/** 部门编号*/
-	private String departmentId;
+	private List<String> deps;
 	/** 外包*/
 	private Integer outsource;
 	/** 外包名称*/
@@ -350,12 +351,15 @@ public class OrderListBo {
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
 	}
-	public String getDepartmentId() {
-		return departmentId;
+
+	public List<String> getDeps() {
+		return deps;
 	}
-	public void setDepartmentId(String departmentId) {
-		this.departmentId = departmentId;
+
+	public void setDeps(List<String> deps) {
+		this.deps = deps;
 	}
+
 	public Integer getOutsource() {
 		return outsource;
 	}

+ 2 - 7
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -3,8 +3,6 @@ package com.goafanti.order.controller;
 
 
 import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -323,12 +321,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String aid,String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer approval,
-			Integer distribution,List<String> deps,String contractNo,Integer outsource,Integer liquidationStatus,Integer amountStatus,
-							   String contractStart,String contractEnd,String uid,Integer projectType,Integer processStatus,Integer pageNo,Integer pageSize){
+	public Result orderNewList(InputOrderNewListBo in){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(aid,name, orderNo, starTime, endTime, specially ,approval, distribution,deps,
-				contractNo,outsource, liquidationStatus,amountStatus,contractStart, contractEnd,uid, projectType,processStatus,pageNo, pageSize));
+		res.data(orderNewService.orderNewList(in));
 		return res;
 	}
 

+ 7 - 6
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -21,6 +21,8 @@ import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/api/admin/orderChange")
 public class OrderChangeApiController extends CertifyApiController {
@@ -288,7 +290,6 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @param timeType
 	 * @param startTime
 	 * @param endTime
-	 * @param depId
 	 * @param salesmanName
 	 * @param complete
 	 * @param orderNo
@@ -299,11 +300,11 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value ="/orderChangeList",method = RequestMethod.GET)
-	public Result orderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-			String depId,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
+	public Result orderChangeList(String userName, Integer  processState, Integer timeType, String startTime, String endTime,
+								  List<String> deps, String salesmanName, Integer complete, String orderNo, String contractNo, Integer type, Integer pageSize, Integer pageNo) {
 		Result res =new Result();
 		res.data(orderChangeService.selectOrderChangeList( userName,  processState, timeType, startTime, endTime,
-				depId, salesmanName, complete, orderNo,  contractNo, type,pageSize,  pageNo));
+				 deps, salesmanName, complete, orderNo,  contractNo, type,pageSize,  pageNo));
 		return res;
 	}
 	/**
@@ -426,11 +427,11 @@ public class OrderChangeApiController extends CertifyApiController {
      */
     @RequestMapping(value = "/exportMyChange" , method = RequestMethod.GET)
     public Result exportMyBill(HttpServletResponse response,String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-			String depId,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo)  {
+							   List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo)  {
     	Result res=new Result();
 			try {
 				orderChangeService.exportMyChange( response, userName,  processState, timeType, startTime, endTime,
-						 depId, salesmanName, complete, orderNo,  contractNo, type, pageSize,  pageNo);
+						 deps, salesmanName, complete, orderNo,  contractNo, type, pageSize,  pageNo);
 			} catch (Exception e) {
 				res.getError().add(buildError("格式不正确"));
 				e.printStackTrace();

+ 2 - 2
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -50,7 +50,7 @@ public interface OrderChangeService {
 	 * @return
 	 */
 	Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-			String depId,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize, Integer pageNo );
+														  List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize, Integer pageNo );
 
 	int updateOrderChange(NewOrderChangeBo t, Integer changeType,String startRemarks);
 
@@ -67,7 +67,7 @@ public interface OrderChangeService {
 	Map<String ,Object> listOrderInvoiceAndBill(String orderNo);
 
 	void exportMyChange(HttpServletResponse response, String userName, Integer processState, Integer timeType,
-			String startTime, String endTime, String depId, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
+			String startTime, String endTime, List<String> deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type, Integer pageSize,
 			Integer pageNo) throws IOException ;
 
 

+ 1 - 10
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -62,17 +62,8 @@ public interface OrderNewService {
 	int createOrderDun(String orderDun,String orderNo);
 	/**
 	 * 订单列表
-	 * @param name
-	 * @param orderNo
-	 * @param starTime
-	 * @param endTime
-	 * @param pageNo
-	 * @param pageSize
-	 * @param amountStatus
 	 */
-	Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially ,
-										 Integer approval,Integer distribution,List<String> deps,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-										 String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus, Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(InputOrderNewListBo in);
 	/**
 	 * 订单审核
 	 * @param orderNo

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -162,8 +162,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包
 		params.put("o", order);
-		if (order.getDepartmentId()!=null){
-			params.put("deps", departmentService.getLowerDep(order.getDepartmentId()));
+		if (order.getDeps().isEmpty()){
+			params.put("deps", order.getDeps());
 		}
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
 		result.put("pagination", data);

+ 8 - 8
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -494,7 +494,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer  processState,Integer timeType,String startTime,String endTime,
-			String depId,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
+																 List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
 		Map<String, Object> parameter=new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -509,9 +509,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (StringUtils.isNotBlank(startTime)) parameter.put("startTime", startTime);
 		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
 		if (processState==1){
-			List<Department> myDep;
-			if (StringUtils.isNotBlank(depId)) {
-				myDep=departmentService.selectSubDeps(depId,0,1);
+			List<String > myDep;
+			if (!deps.isEmpty()) {
+				myDep=departmentService.selectSubDeps(deps);
 				if (myDep.isEmpty()){
 					return new Pagination(1,10,0);
 				}
@@ -520,8 +520,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 			parameter.put("deps",myDep);
 		}else {
-			if (StringUtils.isNotBlank(depId)) {
-				parameter.put("deps",departmentService.getLowerDep(depId));
+			if (!deps.isEmpty()) {
+				parameter.put("deps",deps);
 			}
 		}
 		if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
@@ -815,10 +815,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@SuppressWarnings("unchecked")
 	@Override
 	public void exportMyChange(HttpServletResponse response, String userName, Integer processState, Integer timeType,
-			String startTime, String endTime, String depId, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize,Integer pageNo) throws IOException {
+			String startTime, String endTime, List<String> deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize,Integer pageNo) throws IOException {
 		OutputStream out = response.getOutputStream();
 		List<NewOderCahngeListBo>list=(List<NewOderCahngeListBo>) selectOrderChangeList( userName,  processState, timeType, startTime, endTime,
-				 depId, salesmanName, complete, orderNo,  contractNo, type, pageSize,  pageNo).getList();
+				 deps, salesmanName, complete, orderNo,  contractNo, type, pageSize,  pageNo).getList();
 		try {
     		//设计表头  String[] comment = {"合同编号","订单编号","客户名称","订单部门","订单类型","下单时间","订单状态","合同额(万元)","已付额(万元)","欠款(万元)","订单负责人","变更类型","变更审核状态","变更提交时间"}
     		String[] comment = {"合同编号","订单编号","客户名称","订单部门","订单类型","下单时间","订单状态","合同额(万元)","已付额(万元)","欠款(万元)","订单负责人","变更类型","变更审核状态","变更提交时间"};

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -140,8 +140,8 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			aDep=adminMapper.selectDepIdWithSpuerId(TokenManager.getAdminId());
 			params.put("aDep", aDep);
 		}
-		if(StringUtils.isNotBlank(o.getOrderDep())){
-			params.put("deps", departmentService.getLowerDep(o.getOrderDep()));
+		if(!o.getDeps().isEmpty()){
+			params.put("deps", o.getDeps());
 		}
 		if(o.getType()!=null)params.put("type", o.getType());
 		//营销管理员

+ 65 - 66
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -600,110 +600,109 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
-			Integer distribution,List<String> deps,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-												String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus,  Integer pageNo, Integer pageSize) {
+	public Pagination<TOrderNewBo> orderNewList(InputOrderNewListBo in) {
 		Map<String, Object> params = new HashMap<>();
-		if (specially!=null&&(specially==0||specially==1||specially==2||specially==4||specially==5||specially==7)) {
+		if (in.getSpecially()!=null&&(in.getSpecially()==0||in.getSpecially()==1||in.getSpecially()==2||in.getSpecially()==4||in.getSpecially()==5||in.getSpecially()==7)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
-			if (specially!=3&&specially!=4) {
-				if (aid ==null){
+			if (in.getSpecially()!=3&&in.getSpecially()!=4) {
+				if (in.getAid() ==null){
 					params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 				}else{
-					params.put("aid", aid);
+					params.put("aid", in.getAid());
 				}
 			}
 			//(咨询师管理列表 0 未分配 1部分   2全部)
-			if(specially==4) {
-				params.put("distribution",distribution);
+			if(in.getSpecially()==4) {
+				params.put("distribution",in.getDistribution());
 			}
 
-		}else if(specially==8){
-			if (StringUtils.isNotBlank(uid)) {
-				params.put("uid", uid);
+		}else if(in.getSpecially()==8){
+			if (StringUtils.isNotBlank(in.getUid())) {
+				params.put("uid", in.getUid());
 			}
-		}else if (specially==9){
-			if (StringUtils.isNotBlank(aid)) {
-				params.put("aid", aid);
+		}else if (in.getSpecially()==9){
+			if (StringUtils.isNotBlank(in.getAid())) {
+				params.put("aid", in.getAid());
 			}
 		}
-			params.put("specially",specially);
-		if (StringUtils.isNotBlank(name)) {
-			params.put("name", name);
+			params.put("specially",in.getSpecially());
+		if (StringUtils.isNotBlank(in.getName())) {
+			params.put("name", in.getName());
 		}
 		// 计算出所有本部门及所属部门的ID
 		List<String> departmentList = new ArrayList<>();
-		if(specially==1||specially==5) {
-			if (deps!=null){
-				departmentList=departmentService.selectSubDeps(deps,0,1);
+		if(in.getSpecially()==1||in.getSpecially()==5) {
+			if (in.getDeps()!=null){
+				departmentList=departmentService.selectSubDeps(in.getDeps());
 			}else {
 				departmentList=departmentService.selectMyDeps();
 			}
 		}
-		if (!deps.isEmpty())params.put("deps",deps);
-		if (StringUtils.isNotBlank(contractNo)) {
-			params.put("contractNo", contractNo);
+		if (!in.getDeps().isEmpty())params.put("deps",in.getDeps());
+		if (StringUtils.isNotBlank(in.getContractNo())) {
+			params.put("contractNo", in.getContractNo());
 		}
-		if (null!=liquidationStatus) {
-			params.put("liquidationStatus", liquidationStatus);
-			if (null !=approval) {
-				params.put("approval", approval);
+		if (null!=in.getLiquidationStatus()) {
+			params.put("liquidationStatus", in.getLiquidationStatus());
+
+			if (null !=in.getApproval()) {
+				params.put("approval", in.getApproval());
 			}
-			if(null != amountStatus) {
-				params.put("amountStatus", amountStatus);
+			if(null != in.getAmountStatus()) {
+				params.put("amountStatus", in.getAmountStatus());
 			}
-			if (StringUtils.isNotBlank(orderNo)) {
-				params.put("orderNo", orderNo);
+			if (StringUtils.isNotBlank(in.getOrderNo())) {
+				params.put("orderNo", in.getOrderNo());
 			}
-			if (StringUtils.isNotBlank(starTime)) {
-				params.put("starTime", starTime);
+			if (StringUtils.isNotBlank(in.getStarTime())) {
+				params.put("starTime", in.getStarTime());
 			}
-			if (StringUtils.isNotBlank(endTime)) {
-				params.put("endTime", endTime+" 23:59:59");
+			if (StringUtils.isNotBlank(in.getEndTime())) {
+				params.put("endTime", in.getEndTime()+" 23:59:59");
 			}
-			if (StringUtils.isNotBlank(contractStart)) {
-				params.put("contractStart", contractStart);
+			if (StringUtils.isNotBlank(in.getContractStart())) {
+				params.put("contractStart", in.getContractStart());
 			}
-			if (StringUtils.isNotBlank(contractEnd)) {
-				params.put("contractEnd", contractEnd+" 23:59:59");
+			if (StringUtils.isNotBlank(in.getContractEnd())) {
+				params.put("contractEnd", in.getContractEnd()+" 23:59:59");
 			}
-			if(null != projectType) {
-				params.put("projectType",projectType);
+			if(null != in.getProjectType()) {
+				params.put("projectType",in.getProjectType());
 			}
-			if(null != processStatus) {
-				params.put("processStatus",processStatus);
+			if(null != in.getProcessStatus()) {
+				params.put("processStatus",in.getProcessStatus());
 			}
 		} else {
-			if (null !=approval) {
-				params.put("approval", approval);
+			if (null !=in.getApproval()) {
+				params.put("approval", in.getApproval());
 			}
-			if(null != amountStatus) {
-				params.put("amountStatus", amountStatus);
+			if(null != in.getAmountStatus()) {
+				params.put("amountStatus", in.getAmountStatus());
 			}
-			if (StringUtils.isNotBlank(orderNo)) {
-				params.put("orderNo", orderNo);
+			if (StringUtils.isNotBlank(in.getOrderNo())) {
+				params.put("orderNo", in.getOrderNo());
 			}
-			if (StringUtils.isNotBlank(starTime)) {
-				params.put("starTime", starTime);
+			if (StringUtils.isNotBlank(in.getStarTime())) {
+				params.put("starTime", in.getStarTime());
 			}
-			if (StringUtils.isNotBlank(endTime)) {
-				params.put("endTime", endTime+" 23:59:59");
+			if (StringUtils.isNotBlank(in.getEndTime())) {
+				params.put("endTime", in.getEndTime()+" 23:59:59");
 			}
-			if (StringUtils.isNotBlank(contractStart)) {
-				params.put("contractStart", contractStart);
+			if (StringUtils.isNotBlank(in.getContractStart())) {
+				params.put("contractStart", in.getContractStart());
 			}
-			if (StringUtils.isNotBlank(contractEnd)) {
-				params.put("contractEnd", contractEnd+" 23:59:59");
+			if (StringUtils.isNotBlank(in.getContractEnd())) {
+				params.put("contractEnd", in.getContractEnd()+" 23:59:59");
 			}
-			if(null != projectType) {
-				params.put("projectType",projectType);
+			if(null != in.getProjectType()) {
+				params.put("projectType",in.getProjectType());
 			}
-			if(null != processStatus) {
-				params.put("processStatus",processStatus);
+			if(null != in.getProcessStatus()) {
+				params.put("processStatus",in.getProcessStatus());
 			}
 		}
-		params.put("outsource", outsource);
-		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
+		params.put("outsource", in.getOutsource());
+		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, in.getPageNo(), in.getPageSize());
 		return p;
 	}
 
@@ -1747,8 +1746,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(in.getName())) {
 			params.put("name", in.getName());
 		}
-		if (StringUtils.isNotBlank(in.getDepId())) {
-			params.put("deps", departmentService.getLowerDep(in.getDepId()));
+		if (!in.getDeps().isEmpty()) {
+			params.put("deps", in.getDeps());
 		}
 		if (StringUtils.isNotBlank(in.getAdminName())) {
 			params.put("adminName", in.getAdminName());

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1084,8 +1084,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private void addParam(InputMemberList in, HashMap<String, Object> map) {
 		if(in.getOrderNo()!=null) map.put("orderNo", in.getOrderNo());
 		if(in.getUserName()!=null) map.put("userName", in.getUserName());
-		if(in.getDepId()!=null){
-			map.put("deps", departmentService.getLowerDep(in.getDepId()));
+		if(!in.getDeps().isEmpty()){
+			map.put("deps", in.getDeps());
 		}
 		if(in.getContractNo()!=null) map.put("contractNo", in.getContractNo());
 		if(in.getSalesmanId()!=null) map.put("salesmanId", in.getSalesmanId());

+ 2 - 7
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -71,13 +71,8 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 
 
 	private void addsignStatisticsParam(InputSignStatistics in, Map<String, Object> map) {
-		if (in.getDepId()!=null){
-			String[] ss=in.getDepId().split(",");
-			List<Department> ls=new ArrayList<>();
-			Arrays.stream(ss).forEach(e ->{
-				ls.addAll(departmentService.selectSubDeps(e));
-			});
-			map.put("deps",ls);
+		if (!in.getDeps().isEmpty()){
+			map.put("deps",in.getDeps());
 		}
 		if (StringUtils.isNotBlank(in.getAid())) map.put("aid", in.getAid());
 		if (StringUtils.isNotBlank(in.getUid())) map.put("uid", in.getUid());

+ 17 - 12
src/main/java/com/goafanti/organization/bo/InputPaymentList.java

@@ -1,14 +1,16 @@
 package com.goafanti.organization.bo;
 
+import java.util.List;
+
 public class InputPaymentList {
 	private String contractNo;
-	private String orderNo; 
+	private String orderNo;
 	private String userName;
-	private String depId;
-	private String aname; 
+	private List<String> deps;
+	private String aname;
 	private String financeName;
-	private String cname; 
-	private String pname; 
+	private String cname;
+	private String pname;
 	private Integer status;
 	private Integer chooseType;
 	private Integer pageSize;
@@ -25,7 +27,7 @@ public class InputPaymentList {
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
 	}
-	
+
 	public String getAname() {
 		return aname;
 	}
@@ -66,7 +68,7 @@ public class InputPaymentList {
 		return pageNo;
 	}
 	public void setPageNo(Integer pageNo) {
-		
+
 		this.pageNo = pageNo;
 	}
 	public String getUserName() {
@@ -75,12 +77,15 @@ public class InputPaymentList {
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
-	public String getDepId() {
-		return depId;
+
+	public List<String> getDeps() {
+		return deps;
 	}
-	public void setDepId(String depId) {
-		this.depId = depId;
+
+	public void setDeps(List<String> deps) {
+		this.deps = deps;
 	}
+
 	public String getPname() {
 		return pname;
 	}
@@ -93,7 +98,7 @@ public class InputPaymentList {
 	public void setChooseType(Integer chooseType) {
 		this.chooseType = chooseType;
 	}
-	
+
 
 
 }

+ 2 - 2
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -159,7 +159,6 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo) {
 		//获取上级编号
 		Department superDep=departmentMapper.selectByPrimaryKey(superId);
-
 		Date now=new Date();
 		Department dep=new Department();
 		dep.setLvl(superDep.getLvl()+1);
@@ -170,6 +169,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setStatus(status);
 		dep.setRemarks(remarks);
 		dep.setId(id);
+		dep.setSuperId(superId);
 		dep.setDepNo(depNo);
 		dep.setAbbreviation(abbreviation);
 		dep.setFinanceId(financeId);
@@ -186,7 +186,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		String useDepNo=departmentMapper.selectIdByDepNo(depNo);
 		if (StringUtils.isNotBlank(useDepNo)){
 			if (type==1){
-				if (depNo.equals(useDepNo)){
+				if (!depNo.equals(useDepNo)){
 					return false;
 				}else {
 					return true;

+ 2 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -648,8 +648,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
 		if (i.getOrderNo()!=null)map.put("orderNo", i.getOrderNo());
 		if (i.getUserName()!=null)map.put("userName", i.getUserName());
-		if (i.getDepId()!=null){
-			map.put("deps", departmentService.getLowerDep(i.getDepId()));
+		if (!i.getDeps().isEmpty()){
+			map.put("deps", i.getDeps());
 		}
 		if (i.getAname()!=null)map.put("aname", i.getAname());
 		if (i.getFinanceName()!=null)map.put("financeName", i.getFinanceName());

+ 15 - 13
src/main/java/com/goafanti/patent/bo/PatentNewBo.java

@@ -2,15 +2,16 @@ package com.goafanti.patent.bo;
 
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.goafanti.common.model.PatentNew;
 import com.goafanti.common.utils.excel.Excel;
 
 public class PatentNewBo extends PatentNew{
 
-	
+
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 1L;
 
@@ -60,8 +61,8 @@ public class PatentNewBo extends PatentNew{
 	private String createTimes;
 	@Excel(name = "跟进人")
 	private String aname;
-	private String inputDep;
-	private String followDep;
+	private List<String> inputDep;
+	private List<String> followDep;
 	private String updateTimes;
 	private String startDates;
 	private String endDates;
@@ -70,19 +71,20 @@ public class PatentNewBo extends PatentNew{
 	private String createEnds;
 	private Integer isFollow;
 
-	public String getFollowDep() {
-		return followDep;
+	public List<String> getInputDep() {
+		return inputDep;
 	}
 
-	public void setFollowDep(String followDep) {
-		this.followDep = followDep;
+	public void setInputDep(List<String> inputDep) {
+		this.inputDep = inputDep;
 	}
-	public String getInputDep() {
-		return inputDep;
+
+	public List<String> getFollowDep() {
+		return followDep;
 	}
 
-	public void setInputDep(String inputDep) {
-		this.inputDep = inputDep;
+	public void setFollowDep(List<String> followDep) {
+		this.followDep = followDep;
 	}
 
 	public Integer getCostReduction() {
@@ -157,7 +159,7 @@ public class PatentNewBo extends PatentNew{
 	public void setEmail(String email) {
 		this.email = email;
 	}
-	
+
 	public String getProjectName() {
 		return projectName;
 	}

+ 4 - 4
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -232,11 +232,11 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		if(p.getAnnualFeeStatus()!=null)params.put("annualFeeStatus", p.getAnnualFeeStatus());
 		if(p.getUserName()!=null)params.put("userName", p.getUserName());
 		if(p.getSalesmanRemind()!=null)params.put("salesmanRemind", p.getSalesmanRemind());
-		if(p.getInputDep()!=null){
-			params.put("inputDep", departmentService.getLowerDep(p.getInputDep()));
+		if(!p.getInputDep().isEmpty()){
+			params.put("inputDep", p.getInputDep());
 		}
-		if(p.getFollowDep()!=null){
-			params.put("followDep", departmentService.getLowerDep(p.getFollowDep()));
+		if(!p.getFollowDep().isEmpty()){
+			params.put("followDep", p.getFollowDep());
 		}
 
 		if(p.getIsFollow()!=null) {

+ 7 - 5
src/main/java/com/goafanti/user/bo/InputUserFollowList.java

@@ -1,5 +1,7 @@
 package com.goafanti.user.bo;
 
+import java.util.List;
+
 public class InputUserFollowList {
 
     private String userName;
@@ -12,7 +14,7 @@ public class InputUserFollowList {
     private String createEndTime;
     private String guidanceStartTime;
     private String guidanceEndTime;
-    private String depId;
+    private List<String> deps;
     /** 0自己 1下级 2全部*/
     private Integer shiroType;
     private String followName;
@@ -83,12 +85,12 @@ public class InputUserFollowList {
         this.guidanceEndTime = guidanceEndTime;
     }
 
-    public String getDepId() {
-        return depId;
+    public List<String> getDeps() {
+        return deps;
     }
 
-    public void setDepId(String depId) {
-        this.depId = depId;
+    public void setDeps(List<String> deps) {
+        this.deps = deps;
     }
 
     public Integer getPageSize() {

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserFollowServiceImpl.java

@@ -53,8 +53,8 @@ public class UserFollowServiceImpl extends BaseMybatisDao<UserFollowMapper>  imp
         if (in.getCreateEndTime()!=null) map.put("createEndTime", in.getCreateEndTime()+" 23:59:59");
         if (in.getGuidanceStartTime()!=null) map.put("guidanceStartTime", in.getGuidanceStartTime());
         if (in.getGuidanceEndTime()!=null) map.put("guidanceEndTime", in.getGuidanceEndTime()+" 23:59:59");
-        if (in.getDepId() != null){
-            map.put("deps", departmentService.getLowerDep(in.getDepId()));
+        if (!in.getDeps().isEmpty()){
+            map.put("deps", in.getDeps());
         }
         if (in.getShiroType()!=null)map.put("shiroType",in.getShiroType());
         else map.put("shiroType",0);