擦屁股 加入tenantId

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

@@ -7,8 +7,10 @@ import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
 import com.ym.mec.biz.service.MemberPrivilegesItemService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,13 +26,15 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Autowired
 	private MemberRankPrivilegesDao memberRankPrivilegesDao;
 
+
+
 	@Override
 	public BaseDAO<Integer, MemberPrivilegesItem> getDAO() {
 		return memberPrivilegesItemDao;
 	}
 
 	private MemberPrivilegesItem getTree(MemberPrivilegesItem item){
-		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId());
+		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId(), TenantContextHolder.getTenantId());
 		if(privilegesItems != null && privilegesItems.size() > 0) {
 			item.setMemberPrivilegesItems(privilegesItems);
 			for (MemberPrivilegesItem privilegesItem : privilegesItems) {
@@ -52,7 +56,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 		if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItemId)){
 			throw new BizException("删除失败：该功能已被使用");
 		}
-		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(memberPrivilegesItemId);
+		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(memberPrivilegesItemId,TenantContextHolder.getTenantId());
 		for (MemberPrivilegesItem item : memberPrivilegesItems) {
 			item = getTree(item);
 		}
@@ -80,7 +84,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 
 	@Override
 	public List<MemberPrivilegesItem> findAllItem(MemberPrivilegesItemQueryInfo queryInfo) {
-		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId());
+		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId(),TenantContextHolder.getTenantId());
 		if(rows == null || rows.size() == 0){
 			return rows;
 		}
@@ -93,7 +97,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateItem(MemberPrivilegesItem memberPrivilegesItem) {
-		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId());
+		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId(),TenantContextHolder.getTenantId());
 		if(itemList.size() == 0){
 			if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItem.getParentId())){
 				throw new BizException("修改失败：被关联的子集不能被添加子功能");
@@ -116,7 +120,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(MemberPrivilegesItem memberPrivilegesItem) {
-		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId());
+		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId(),TenantContextHolder.getTenantId());
 		if(itemList.size() == 0){
 			if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItem.getParentId())){
 				throw new BizException("修改失败：被关联的子集不能被添加子功能");