|  | @@ -69,7 +69,7 @@ public class NewsController extends BaseController {
 | 
											
												
													
														|  |  	public Object getList(NewsInformationQueryInfo queryInfo) {
 |  |  	public Object getList(NewsInformationQueryInfo queryInfo) {
 | 
											
												
													
														|  |  		SysUser user = sysUserFeignService.queryUserInfo();
 |  |  		SysUser user = sysUserFeignService.queryUserInfo();
 | 
											
												
													
														|  |  		
 |  |  		
 | 
											
												
													
														|  | -		if(queryInfo.getType() == 6 || queryInfo.getType() == 7){
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(queryInfo.getType() == 6 || queryInfo.getType() == 4){
 | 
											
												
													
														|  |  			queryInfo.setTenantId(-1);
 |  |  			queryInfo.setTenantId(-1);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -111,7 +111,7 @@ public class NewsController extends BaseController {
 | 
											
												
													
														|  |  	@GetMapping(value = "/queryPage")
 |  |  	@GetMapping(value = "/queryPage")
 | 
											
												
													
														|  |  	public Object queryPage(NewsInformationQueryInfo queryInfo) {
 |  |  	public Object queryPage(NewsInformationQueryInfo queryInfo) {
 | 
											
												
													
														|  |  		
 |  |  		
 | 
											
												
													
														|  | -		if(queryInfo.getType() != null && (queryInfo.getType() == 6 || queryInfo.getType() == 7)){
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(queryInfo.getType() != null && (queryInfo.getType() == 6 || queryInfo.getType() == 4)){
 | 
											
												
													
														|  |  			queryInfo.setTenantId(-1);
 |  |  			queryInfo.setTenantId(-1);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  		
 |  |  		
 | 
											
										
											
												
													
														|  | @@ -163,7 +163,7 @@ public class NewsController extends BaseController {
 | 
											
												
													
														|  |  	@PreAuthorize("@pcs.hasPermissions('news/add')")
 |  |  	@PreAuthorize("@pcs.hasPermissions('news/add')")
 | 
											
												
													
														|  |  	public Object add(SysNewsInformation newsInfo) {
 |  |  	public Object add(SysNewsInformation newsInfo) {
 | 
											
												
													
														|  |  		
 |  |  		
 | 
											
												
													
														|  | -		if(newsInfo.getType() == 6 || newsInfo.getType() == 7){
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(newsInfo.getType() == 6 || newsInfo.getType() == 4){
 | 
											
												
													
														|  |  			newsInfo.setTenantId(-1);
 |  |  			newsInfo.setTenantId(-1);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  		if (newsInfo.getContent().length() > 7999) {
 |  |  		if (newsInfo.getContent().length() > 7999) {
 | 
											
										
											
												
													
														|  | @@ -189,7 +189,7 @@ public class NewsController extends BaseController {
 | 
											
												
													
														|  |  			newsInfo.setType(originNewsInfo.getType());
 |  |  			newsInfo.setType(originNewsInfo.getType());
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  		
 |  |  		
 | 
											
												
													
														|  | -		if(newsInfo.getType() == 6 || newsInfo.getType() == 7){
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(newsInfo.getType() == 6 || newsInfo.getType() == 4){
 | 
											
												
													
														|  |  			newsInfo.setTenantId(-1);
 |  |  			newsInfo.setTenantId(-1);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  		return succeed(sysNewsInformationService.update(newsInfo));
 |  |  		return succeed(sysNewsInformationService.update(newsInfo));
 |