diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java index dcbdcace..9caf5fe2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java @@ -1,59 +1,59 @@ -package com.bonus.canteen.core.auth.user.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bonus.canteen.core.auth.role.dto.MgrRoleUserDTO; -import com.bonus.canteen.core.auth.role.vo.MgrRoleUserVO; -import com.bonus.canteen.core.auth.user.entity.MgrUser; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface MgrUserMapper extends BaseMapper { -// Page selectRolePage(Page page, @Param("userPageDTO") MgrUserPageDTO userPageDTO); - +//package com.bonus.canteen.core.auth.user.mapper; +// +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.bonus.canteen.core.auth.role.dto.MgrRoleUserDTO; +//import com.bonus.canteen.core.auth.role.vo.MgrRoleUserVO; +//import com.bonus.canteen.core.auth.user.entity.MgrUser; +//import org.apache.ibatis.annotations.Mapper; +// +//import java.util.List; +// +//@Mapper +//public interface MgrUserMapper extends BaseMapper { +//// Page selectRolePage(Page page, @Param("userPageDTO") MgrUserPageDTO userPageDTO); +// // List selectAllUserByRoleCode(MgrRoleUserDTO deliveryUserDTO); - -// MgrUserDetailVO selectUserInfoByUserId(@Param("userId") Long userId, @Param("delFlag") Integer delFlag); // -// @Select({"select count(0) from alloc_canteen where cust_id = #{userId};"}) -// int checkCountBasicsDdiningUserId(Long userId); -// -// @Select({"select count(0) from alloc_stall where cust_id = #{userId};"}) -// int checkBasicsShopstallsUserId(Long userId); -// -// @Select({"select count(0) from drp_warehouse where user_id = #{userId};"}) -// int checkDrpWarehouse(Long userId); -// -// @Select({"select user_id, real_name from mgr_user ${ew.customSqlSegment}"}) -// MgrUserIdNameVO selectIdAndRealNameByWrapper(@Param("ew") Wrapper wrapper); -// -// @Select({"select dining_id as canteen_id, shopstall_id from basics_shopstalls ${ew.customSqlSegment}"}) -// List selectShopstallByWrapper(@Param("ew") Wrapper wrapper); -// -// @Select({"select canteen_id, shopstall_id from mkt_effective_detail ${ew.customSqlSegment}"}) -// List selectCanteenByWrapper(@Param("ew") Wrapper wrapper); -// -// @Select({"select 1 from mkt_effective ${ew.customSqlSegment}"}) -// Integer selectExistFromMktEffectiveByWrapper(@Param("ew") Wrapper wrapper); -// -// List listUserByIdAndRole(@Param("userId") Long userId, @Param("roleCode") String roleCode, @Param("delFlag") Integer delFlag); -// -// Long selectUserIdByCustId(@Param("custId") Long custId); -// -// String selectUserNameIdByCustId(@Param("custId") Long custId); -// -// Long selectCustIdByUserId(@Param("userId") Long userId); -// -// List getUserExcludeSupplier(@Param("delFlag") Integer delFlag); -// -// MgrUser getUserByRoleCode(@Param("roleCode") String roleCode); -// -// List queryByRoles(@Param("roles") List roles); -// -// List queryMgrUserIdListByCustIdList(@Param("custIdList") List custIdList); -// -// List queryCanteenManagerMgrUserList(@Param("caneenIdList") List caneenIdList); -// -// MgrUser getUserByRoleCodeExcludeUserName(@Param("roleCode") String roleCode, @Param("excludeUserName") String excludeUserName); -} +//// MgrUserDetailVO selectUserInfoByUserId(@Param("userId") Long userId, @Param("delFlag") Integer delFlag); +//// +//// @Select({"select count(0) from alloc_canteen where cust_id = #{userId};"}) +//// int checkCountBasicsDdiningUserId(Long userId); +//// +//// @Select({"select count(0) from alloc_stall where cust_id = #{userId};"}) +//// int checkBasicsShopstallsUserId(Long userId); +//// +//// @Select({"select count(0) from drp_warehouse where user_id = #{userId};"}) +//// int checkDrpWarehouse(Long userId); +//// +//// @Select({"select user_id, real_name from mgr_user ${ew.customSqlSegment}"}) +//// MgrUserIdNameVO selectIdAndRealNameByWrapper(@Param("ew") Wrapper wrapper); +//// +//// @Select({"select dining_id as canteen_id, shopstall_id from basics_shopstalls ${ew.customSqlSegment}"}) +//// List selectShopstallByWrapper(@Param("ew") Wrapper wrapper); +//// +//// @Select({"select canteen_id, shopstall_id from mkt_effective_detail ${ew.customSqlSegment}"}) +//// List selectCanteenByWrapper(@Param("ew") Wrapper wrapper); +//// +//// @Select({"select 1 from mkt_effective ${ew.customSqlSegment}"}) +//// Integer selectExistFromMktEffectiveByWrapper(@Param("ew") Wrapper wrapper); +//// +//// List listUserByIdAndRole(@Param("userId") Long userId, @Param("roleCode") String roleCode, @Param("delFlag") Integer delFlag); +//// +//// Long selectUserIdByCustId(@Param("custId") Long custId); +//// +//// String selectUserNameIdByCustId(@Param("custId") Long custId); +//// +//// Long selectCustIdByUserId(@Param("userId") Long userId); +//// +//// List getUserExcludeSupplier(@Param("delFlag") Integer delFlag); +//// +//// MgrUser getUserByRoleCode(@Param("roleCode") String roleCode); +//// +//// List queryByRoles(@Param("roles") List roles); +//// +//// List queryMgrUserIdListByCustIdList(@Param("custIdList") List custIdList); +//// +//// List queryCanteenManagerMgrUserList(@Param("caneenIdList") List caneenIdList); +//// +//// MgrUser getUserByRoleCodeExcludeUserName(@Param("roleCode") String roleCode, @Param("excludeUserName") String excludeUserName); +//} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml index 4d86a9bd..94a2db9f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml @@ -1,6 +1,6 @@ - - - + + + @@ -246,7 +246,7 @@ - +