|
|
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
+import com.goafanti.common.enums.UserFields;
|
|
|
import com.goafanti.common.model.*;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
@@ -507,8 +508,21 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (null!=timeType) parameter.put("timeType", timeType);
|
|
|
if (StringUtils.isNotBlank(startTime)) parameter.put("startTime", startTime);
|
|
|
if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
|
|
|
- if (StringUtils.isNotBlank(depId)) {
|
|
|
- parameter.put("deps",departmentService.getLowerDep(depId));
|
|
|
+ if (processState==1){
|
|
|
+ List<Department> myDep;
|
|
|
+ if (StringUtils.isNotBlank(depId)) {
|
|
|
+ myDep=departmentService.selectSubDeps(depId,0,1);
|
|
|
+ if (myDep.isEmpty()){
|
|
|
+ return new Pagination(1,10,0);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ myDep=departmentService.selectMyDeps();
|
|
|
+ }
|
|
|
+ parameter.put("deps",myDep);
|
|
|
+ }else {
|
|
|
+ if (StringUtils.isNotBlank(depId)) {
|
|
|
+ parameter.put("deps",departmentService.getLowerDep(depId));
|
|
|
+ }
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
|
|
|
if(processState==5&&TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|