|  | @@ -85,7 +85,7 @@ public class AdvertiserController {
 | 
	
		
			
				|  |  |          Result<IPage<Advertiser>> result = new Result<IPage<Advertiser>>();
 | 
	
		
			
				|  |  |          String roleCode = materialReportMapper.getRoleCodeByUserId(advertiser.getUserId());
 | 
	
		
			
				|  |  |          String userId = advertiser.getUserId();
 | 
	
		
			
				|  |  | -        if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode)|| "touTiaoOperationManager".equals(roleCode)) {
 | 
	
		
			
				|  |  | +        if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
 | 
	
		
			
				|  |  |              advertiser.setUserId(null);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
 | 
	
	
		
			
				|  | @@ -130,26 +130,26 @@ public class AdvertiserController {
 | 
	
		
			
				|  |  |      public Result<Advertiser> add(@RequestBody Advertiser advertiser) {
 | 
	
		
			
				|  |  |          Result<Advertiser> result = new Result<Advertiser>();
 | 
	
		
			
				|  |  |          try {
 | 
	
		
			
				|  |  | +            String userId = advertiser.getUserId();
 | 
	
		
			
				|  |  |              String name = advertiser.getName().trim();
 | 
	
		
			
				|  |  | +            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
 | 
	
		
			
				|  |  | +            userCompanyQueryWrapper.eq("user_id", userId);
 | 
	
		
			
				|  |  | +            userCompanyQueryWrapper.orderByDesc("create_time");
 | 
	
		
			
				|  |  | +            userCompanyQueryWrapper.last("limit 1");
 | 
	
		
			
				|  |  | +            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
 | 
	
		
			
				|  |  |              QueryWrapper<Advertiser> advertiserQueryWrapper = new QueryWrapper<>();
 | 
	
		
			
				|  |  |              advertiserQueryWrapper.eq("name", name);
 | 
	
		
			
				|  |  | +            if (!Check.isNull(userCompany)) {
 | 
	
		
			
				|  |  | +                advertiserQueryWrapper.eq("company_id", userCompany.getCompanyId());
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  |              advertiserQueryWrapper.last("limit 1");
 | 
	
		
			
				|  |  |              advertiserQueryWrapper.orderByDesc("create_time");
 | 
	
		
			
				|  |  |              Advertiser checkAdvertiser = advertiserService.getOne(advertiserQueryWrapper);
 | 
	
		
			
				|  |  |              if (!Check.isNull(checkAdvertiser)) {
 | 
	
		
			
				|  |  |                  throw new Exception("广告主已存在");
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -            String userId = advertiser.getUserId();
 | 
	
		
			
				|  |  | -            if (!Check.isNull(userId)) {
 | 
	
		
			
				|  |  | -                QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
 | 
	
		
			
				|  |  | -                userCompanyQueryWrapper.eq("user_id", userId);
 | 
	
		
			
				|  |  | -                userCompanyQueryWrapper.orderByDesc("create_time");
 | 
	
		
			
				|  |  | -                userCompanyQueryWrapper.last("limit 1");
 | 
	
		
			
				|  |  | -                UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
 | 
	
		
			
				|  |  | -                if (!Check.isNull(userCompany)) {
 | 
	
		
			
				|  |  | -                    advertiser.setCompanyId(userCompany.getCompanyId());
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  | +            if (!Check.isNull(userCompany)) {
 | 
	
		
			
				|  |  | +                advertiser.setCompanyId(userCompany.getCompanyId());
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              advertiserService.save(advertiser);
 | 
	
		
			
				|  |  |              result.success("添加成功!");
 |