Commit 184bd926 by zhiwj

修改审批

parent 2dcd2993
...@@ -71,7 +71,7 @@ public interface ResourceApiService { ...@@ -71,7 +71,7 @@ public interface ResourceApiService {
ServiceResponse<SmsSignResourceDTO> getSmsResourceByUserId(Integer userId); ServiceResponse<SmsSignResourceDTO> getSmsResourceByUserId(Integer userId);
/** /**
* 查询用户的渠道资源 * 查询用户的渠道资源(仅当前可用的数据)
* @Title: getChannelResourceByUserId * @Title: getChannelResourceByUserId
* @Description: * @Description:
* @author zhiwj * @author zhiwj
...@@ -81,6 +81,17 @@ public interface ResourceApiService { ...@@ -81,6 +81,17 @@ public interface ResourceApiService {
ServiceResponse<ChannelResourceDTO> getChannelResourceByUserId(Integer userId); ServiceResponse<ChannelResourceDTO> getChannelResourceByUserId(Integer userId);
/** /**
* 查询用户的渠道资源(包含已经删除的数据)
* @Title: getChannelResourceByUserIdContainDel
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.ChannelResourceDTO>
* @throws
*/
ServiceResponse<ChannelResourceDTO> getChannelResourceByUserIdContainDel(Integer userId);
/**
* 查询门店资源 * 查询门店资源
* @Title: getStoreResourceByUserId * @Title: getStoreResourceByUserId
* @Description: * @Description:
......
...@@ -237,6 +237,46 @@ public class ResourceApiServiceImpl implements ResourceApiService { ...@@ -237,6 +237,46 @@ public class ResourceApiServiceImpl implements ResourceApiService {
} }
if (user.getSuperAdmin() == 1) { if (user.getSuperAdmin() == 1) {
List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAll(user.getEnterpriseId()).getResult();
List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listValidAppletConfigAppId(user.getEnterpriseId()).getResult();
List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listValidServiceConfigAppId(user.getEnterpriseId()).getResult();
ChannelResourceDTO channelResourceDTO = new ChannelResourceDTO();
channelResourceDTO.setAppletConfigIdList(Optional.ofNullable(appletList).orElse(Collections.emptyList()).stream().map(AppletsConfigSimpleOutputDTO::getAppletConfigId).collect(Collectors.toList()));
channelResourceDTO.setServiceConfigIdList(Optional.ofNullable(serviceList).orElse(Collections.emptyList()).stream().map(ServiceConfigSimpleOutputDTO::getServiceConfigId).collect(Collectors.toList()));
channelResourceDTO.setCardConfigIdList(Optional.ofNullable(memberCardList).orElse(Collections.emptyList()).stream().map(OwnerMemberCardDTO::getCardConfigId).collect(Collectors.toList()));
return EnterpriseServiceResponse.success(channelResourceDTO);
}
List<UserResourceDTO> resourceDTOList = this.userResourceService.listUserResourceByUserId(userId);
if (CollectionUtils.isEmpty(resourceDTOList)) {
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
}
UserResourceDTO userResourceDTO = resourceDTOList.get(0);
TabSysResource resource = this.resourceService.getResource(userResourceDTO.getResourceId());
if (resource.getChannelResource() == null) {
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
}
TabSysOrderAppResource channelResource = orderAppResourceService.getById(resource.getChannelResource());
ChannelResourceDTO channelResourceDTO = JSON.parseObject(channelResource.getContent(), ChannelResourceDTO.class);
return EnterpriseServiceResponse.success(channelResourceDTO);
}
@Override
public ServiceResponse<ChannelResourceDTO> getChannelResourceByUserIdContainDel(Integer userId) {
TabSysUser user = this.userService.getUserById(userId);
if (user == null) {
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
}
if (user.getSuperAdmin() == 1) {
List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAllContainDel(user.getEnterpriseId()).getResult(); List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAllContainDel(user.getEnterpriseId()).getResult();
List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listAppletConfigAppIdContainDel(user.getEnterpriseId()).getResult(); List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listAppletConfigAppIdContainDel(user.getEnterpriseId()).getResult();
List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listServiceConfigAppIdContainDel(user.getEnterpriseId()).getResult(); List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listServiceConfigAppIdContainDel(user.getEnterpriseId()).getResult();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment