diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index dda44606a..760ce7197 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -122,4 +122,5 @@ public class FilterBussinessTypeRequest extends ListPageRequest { * 是否启用, 1:仅查看,2:增删改查 */ private Integer editType; + private String deptCode; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 6c2828000..19d8bf0c5 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -198,6 +198,7 @@ SELECT basic_bussiness_type.* FROM basic_bussiness_type left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction + left join auth_warehouse on auth_user_bustype.subInvCode = auth_warehouse.`code` AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') @@ -224,6 +225,9 @@ AND subInvCode = #{invCode} + + AND auth_warehouse.parentId = #{deptCode} + AND auth_user_bustype.`userId` = #{userId}