Browse Source

修改部门接口为2种,一种分层级,一种部分层级

anderx 3 years ago
parent
commit
a8530fea93

+ 8 - 0
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -44,4 +44,12 @@ public interface DepartmentService {
 	List<Department> selectSubordinateDeps(String depId);
 
 	List<String>  parseArray(String deps);
+
+	/**
+	 *
+	 * @param aDep 权限获取到部门
+	 * @param deps 筛选部门
+	 * @return 返回权限部门中的筛选部门
+	 */
+	List<String> comparePermissions(List<String> aDep, String deps);
 }

+ 19 - 5
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -106,11 +106,24 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		return myAll;
 	}
 	public List<String> selectSubDeps(List<String>  deps) {
+		return comparePermissions(selectMyDeps(),deps);
+	}
+	@Override
+	public List<String> comparePermissions(List<String> aDep, String deps) {
 		List<String> myAll=new ArrayList<>();
-		List<String> my=selectMyDeps();
-		for (String dep : deps) {
-			for (String dep2 : my) {
-				if (dep.equals(dep2))myAll.add(dep);
+		List<String> input=parseArray(deps);
+		for (String s : aDep) {
+			for (String in : input) {
+				if (s.equals(in))myAll.add(s);
+			}
+		}
+		return myAll;
+	}
+	public List<String> comparePermissions(List<String> aDep, List<String> input) {
+		List<String> myAll=new ArrayList<>();
+		for (String s : aDep) {
+			for (String in : input) {
+				if (s.equals(in))myAll.add(s);
 			}
 		}
 		return myAll;
@@ -123,9 +136,10 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 
 	@Override
 	public List<String> parseArray(String deps) {
-		System.out.println(deps);
 		return JSON.parseArray(deps,String.class);
 	}
 
 
+
+
 }

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

@@ -536,7 +536,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}else {
 			parameter.put("aid", TokenManager.getAdminId());
 		}
-		parameter.put("deps", orderService.selectMyDeps());
 		Pagination<NewOderCahngeListBo> data = (Pagination<NewOderCahngeListBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
 		return data;
 	}

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

@@ -137,20 +137,20 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		}
 		//财务经理
 		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
-			aDep=adminMapper.selectDepIdWithSpuerId(TokenManager.getAdminId());
-			params.put("aDep", aDep);
+			aDep.addAll(adminMapper.selectDepIdWithSpuerId(TokenManager.getAdminId()));
 		}
-		if(o.getDeps()!=null){
-			params.put("deps", departmentService.parseArray(o.getDeps()));
-		}
-		if(o.getType()!=null)params.put("type", o.getType());
 		//营销管理员
 		if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
-			aDep.add(a.getDepartmentId());
-			params.put("aDep", aDep);
+			aDep.addAll(departmentService.selectMyDeps());
 
 		}
+		if(o.getDeps()==null){
+			params.put("deps", aDep);
+		}else {
+			params.put("deps", departmentService.comparePermissions(aDep,o.getDeps()));
+		}
+		if(o.getType()!=null)params.put("type", o.getType());
+
 		if (null !=o.getAll()){
 			params.put("all",o.getAll());
 		}else {

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -654,6 +654,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			List<String>departmentList=new ArrayList<>();
 			if (in.getDeps()!=null){
 				departmentList=departmentService.selectSubDeps(in.getDeps());
+				if (departmentList==null||departmentList.isEmpty()){
+					return  new Pagination<>(1,10,0);
+				}
 			}else {
 				departmentList=departmentService.selectMyDeps();
 			}

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

@@ -236,7 +236,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 			params.put("inputDep", departmentService.parseArray(p.getInputDep()));
 		}
 		if(p.getFollowDep()!=null){
-			params.put("followDep", departmentService.parseArray(p.getInputDep()));
+			params.put("followDep", departmentService.parseArray(p.getFollowDep()));
 		}
 
 		if(p.getIsFollow()!=null) {