|
|
@@ -3,6 +3,7 @@ package com.goafanti.weChat.service.impl;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.*;
|
|
|
|
|
|
+import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -69,6 +70,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private SystemWebSocketHandler systemWebSocketHandler;
|
|
|
@Autowired
|
|
|
private TOrderNewMapper tOrderNewMapper;
|
|
|
+ @Autowired
|
|
|
+ private DepartmentService departmentService;
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> addPublicRelease(InputPublicRelease in) {
|
|
|
@@ -606,7 +609,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private void addParams(InputPublicDtails in, Map<String, Object> map) {
|
|
|
if(in.getAid()!=null) map.put("aid", in.getAid());
|
|
|
if(in.getSid()!=null) map.put("sid", in.getSid());
|
|
|
- if(in.getDepId()!=null) map.put("depId", in.getDepId());
|
|
|
+ if(in.getDeps()!=null){
|
|
|
+ map.put("deps", departmentService.parseArray(in.getDeps()));
|
|
|
+ }
|
|
|
if(in.getReleaseStart()!=null) map.put("releaseStart", in.getReleaseStart());
|
|
|
if(in.getReleaseEnd()!=null) map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
|
|
|
if(in.getCreateStart()!=null) map.put("createStart", in.getCreateStart());
|
|
|
@@ -624,7 +629,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setType(2);
|
|
|
}else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
in.setType(1);
|
|
|
- map.put("deps", orderService.selectMyDeps());
|
|
|
+ map.put("deps", departmentService.selectMyDeps());
|
|
|
}else{
|
|
|
in.setType(0);
|
|
|
if (in.getAid()==null) map.put("aid",TokenManager.getAdminId());
|