Browse Source

省外开票审核超级管理员部门筛选BUG修复

anderx 2 years ago
parent
commit
9734c07b82

+ 4 - 0
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -2,6 +2,7 @@ package com.goafanti.admin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.service.DepartmentService;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DepartmentMapper;
 import com.goafanti.common.dao.WorkingHoursMapper;
 import com.goafanti.common.model.Department;
@@ -123,6 +124,9 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	public List<String> comparePermissions(List<String> aDep, String deps) {
 		List<String> myAll=new ArrayList<>();
 		List<String> input=parseArray(deps);
+		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+			return input;
+		}
 		for (String s : aDep) {
 			for (String in : input) {
 				if (s.equals(in))myAll.add(s);

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

@@ -1,32 +1,27 @@
 package com.goafanti.order.service.impl;
 
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.goafanti.admin.service.DepartmentService;
-import com.goafanti.common.dao.*;
-import com.goafanti.common.model.InvoiceLog;
-import com.goafanti.order.bo.*;
-import com.goafanti.organization.bo.OrganizationListOut;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.InvoiceLog;
 import com.goafanti.common.model.TOrderInvoice;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.*;
 import com.goafanti.order.service.OrderInvoiceService;
 import com.goafanti.order.service.OrderNewService;
+import com.goafanti.organization.bo.OrganizationListOut;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
 
 
 @Service