diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index e10cf8c1..5ed72907 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -318,7 +318,6 @@ public class LoginController extends BaseController { } - @Autowired private InvWarehouseDao invWarehouseDao; @@ -369,7 +368,7 @@ public class LoginController extends BaseController { @GetMapping("/spms/inv/warehouse/filterInv/forUdims") public BaseResponse forUdims() { - FilterInvWarehouseRequest filterInvWarehouseRequest=new FilterInvWarehouseRequest(); + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setSpUse(true); List data = deptService.filterInvDept(filterInvWarehouseRequest); return ResultVOUtils.success(data); @@ -407,8 +406,8 @@ public class LoginController extends BaseController { } - //------------------------------------------UDIMS接口----------------------------------------------------------- + /** * 平台验证 * diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index b4d1ccb3..5a595853 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -304,7 +304,7 @@ public class BasicBussinessTypeEntity { private boolean changeEnable; /** - * 是否供应商使用 + * 是否供应商使用 0:无权限;1:可查看;2:可修改 */ @TableField(value = "spUse") private int spUse; diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 37c557c3..15220eab 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -165,7 +165,11 @@ basic_bussiness_type.name from auth_warehouse_bustype inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action - where code = #{code} + where spUse = 2 + and mainAction = 'WareHouseIn' + and enable = true + and corpType = 2 + and code = #{code} @@ -189,7 +193,8 @@ b1.`name` FROM auth_warehouse_bustype a1 INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action - where b1.spUse=1 and a1.code = #{code} + where b1.spUse = 1 + and a1.code = #{code} group by b1.id