|
@@ -71,7 +71,7 @@ public class GyDataServiceImpl implements GyDataService {
|
|
public List<GyDataImportDTO> list(Map<String, Object> map) {
|
|
public List<GyDataImportDTO> list(Map<String, Object> map) {
|
|
UserDO currUser = ShiroUtils.getUser();
|
|
UserDO currUser = ShiroUtils.getUser();
|
|
log.info("currUser:" + currUser.toString());
|
|
log.info("currUser:" + currUser.toString());
|
|
- if (!managerValue.contains(currUser.getDeptId().toString())) {
|
|
|
|
|
|
+ if (currUser.getDeptId() == null || !managerValue.contains(currUser.getDeptId().toString())) {
|
|
String province = currUser.getProvince();
|
|
String province = currUser.getProvince();
|
|
if(StringUtils.isEmpty(province)){
|
|
if(StringUtils.isEmpty(province)){
|
|
province = sysProvince;
|
|
province = sysProvince;
|