diff --git a/src/main/java/com/spring/modules/base/controller/BaseController.java b/src/main/java/com/spring/modules/base/controller/BaseController.java index a505e1a4..18716be7 100644 --- a/src/main/java/com/spring/modules/base/controller/BaseController.java +++ b/src/main/java/com/spring/modules/base/controller/BaseController.java @@ -613,7 +613,6 @@ public class BaseController extends AbstractController { @PostMapping(value = "/getSiteList") @ResponseBody -// public R getSiteList(@RequestBody SiteVoData inData){ public R getSiteList(SiteVoData inData){ List rows = baseService.getSiteList(inData); return R.ok().put("rows",rows); diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index 470d3451..f6cd2ad8 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -48,6 +48,9 @@ AND customer_id like #{customerId} + + AND (dbo.get_projectUserRoleName(site, project_id) like '%'+#{userName}+';%' or dbo.get_projectUserRoleName(site, project_id) like '%' + #{userName}) + order by LEFT(project_id, CHARINDEX('-', project_id + '-') - 1) desc