Commit 1f24b9f5 by jiaotianqi

类型修改

parent 73f0abe4
package com.gic.auth.service.outer.impl;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.gic.auth.dto.accountgroup.AccountGroupUnionDTO;
import com.gic.auth.dto.wechat.WechatUserDTO;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
import com.gic.enterprise.exception.CommonException;
import com.gic.enterprise.service.UnionEnterpriseAuthApiService;
import com.gic.member.config.api.service.UserGroupPermissionApiService;
import com.gic.popup.config.InitPopupConfig;
import com.gic.popup.config.PopupUtil;
import com.gic.popup.dto.PopupDTO;
import com.gic.popup.dto.RelationBusinessInfoDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.*;
import com.gic.auth.dto.*;
import com.gic.auth.dto.accountgroup.AccountGroupUnionDTO;
import com.gic.auth.dto.wechat.WechatUserDTO;
import com.gic.auth.entity.*;
import com.gic.auth.qo.UserListQO;
import com.gic.auth.service.*;
......@@ -42,10 +19,32 @@ import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.constant.QrcodeTypeEnum;
import com.gic.enterprise.constants.Constants;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.exception.CommonException;
import com.gic.enterprise.service.UnionEnterpriseAuthApiService;
import com.gic.member.config.api.service.UserGroupPermissionApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.popup.config.InitPopupConfig;
import com.gic.popup.config.PopupUtil;
import com.gic.popup.dto.PopupDTO;
import com.gic.popup.dto.RelationBusinessInfoDTO;
import com.gic.redis.data.util.RedisUtil;
import com.gic.store.utils.valid.ValidUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author guojx
......@@ -540,8 +539,8 @@ public class UserApiServiceImpl implements UserApiService {
auditedGroupUserRelService.deleteByUserId(userId);
//删除权限集和资源组引用数据
PopupUtil.deletePopupLog(tabUser.getEnterpriseId(), Long.valueOf(userId), REFER_BUSINESS_USER_ROLE);
PopupUtil.deletePopupLog(tabUser.getEnterpriseId(), Long.valueOf(userId), REFER_BUSINESS_USER_RESOURCE);
PopupUtil.deletePopupLog(tabUser.getEnterpriseId(), String.valueOf(userId), REFER_BUSINESS_USER_ROLE);
PopupUtil.deletePopupLog(tabUser.getEnterpriseId(), String.valueOf(userId), REFER_BUSINESS_USER_RESOURCE);
userService.delete(userId);
......@@ -1006,13 +1005,13 @@ public class UserApiServiceImpl implements UserApiService {
*/
private void saveRefer(Integer businessId, Integer businessType, String[] businessReferIdArr) {
PopupDTO popupDTO = new PopupDTO();
popupDTO.setBusinessId(Long.valueOf(businessId));
popupDTO.setBusinessId(String.valueOf(businessId));
popupDTO.setBusinessName("管理员");
popupDTO.setBusinessType(9);
if (businessReferIdArr != null && businessReferIdArr.length > 0) {
popupDTO.setRelationBusinessIdList(Arrays.stream(businessReferIdArr).filter(e -> StringUtils.isNotBlank(e))
.map(e -> new RelationBusinessInfoDTO(businessType, Long.valueOf(e)))
.map(e -> new RelationBusinessInfoDTO(businessType, String.valueOf(e)))
.collect(Collectors.toList()));
ServiceResponse response = PopupUtil.savePopupLog(popupDTO);
LOGGER.info("保存数据引用结果:{}", JSON.toJSONString(response));
......
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