Merge branch 'saas_yonge' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantContractTemplateServiceImpl.java

@@ -92,9 +92,6 @@ public class TenantContractTemplateServiceImpl extends BaseServiceImpl<Integer,
 	public TenantContractTemplate queryLatestContractTemplate(Integer tenantId, String owner, String type) {
 		TenantContractTemplate tenantContractTemplate = tenantContractTemplateDao.queryLatestContractTemplate(owner, type, tenantId);
 		
-		if(tenantContractTemplate == null){
-			throw new BizException("未查询到协议模板");
-		}
 		return tenantContractTemplate;
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/TenantContractTemplateController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,11 +50,27 @@ public class TenantContractTemplateController extends BaseController {
 		return succeed(tenantContractTemplateService.get(id));
 	}
 
+	@ApiOperation("查询最新启用的协议模板")
+	@GetMapping(value = "/queryLatestContractTemplate")
+	@PreAuthorize("@pcs.hasPermissions('tenantContractTemplate/queryLatestContractTemplate')")
+	public HttpResponseResult<TenantContractTemplate> queryLatestContractTemplate() {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+
+		if (sysUser == null || sysUser.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		return succeed(tenantContractTemplateService.queryLatestContractTemplate(sysUser.getTenantId(), null, null));
+	}
+
 	@ApiOperation("新增")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('tenantContractTemplate/add')")
 	public Object add(TenantContractTemplate tenantContractTemplate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
+        
+        if(sysUser == null || sysUser.getId() == null){
+        	return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
 		
 		tenantContractTemplate.setStatus(false);
 		tenantContractTemplate.setModifyBy(sysUser.getId());