Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2b/dao/MallAdministratorsDao.java

@@ -1,28 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.MallAdministrators;
-
-/**
- * 商城管理员权限表
- * 
- * @author hejq
- * @time 创建时间：2017年6月27日
- */
-@Repository
-public interface MallAdministratorsDao
-		extends JpaRepository<MallAdministrators, Long>, JpaSpecificationExecutor<MallAdministrators> {
-
-	/**
-	 * 通过企业uu查询是否有设置商城管理员的权限
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	List<MallAdministrators> findByAdenuu(Long enuu);
-}

src/main/java/com/uas/platform/b2b/model/MallAdministrators.java

@@ -1,120 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "sec$malladministrators")
-public class MallAdministrators implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$malladministrators_gen")
-	@SequenceGenerator(name = "sec$malladministrators_gen", sequenceName = "sec$malladministrators_seq", allocationSize = 1)
-	@Column(name = "ma_id")
-	private Long id;
-
-	/**
-	 * 可以开通管理员权限的企业uu号
-	 */
-	@Column(name = "ma_adenuu")
-	private Long adenuu;
-
-	/**
-	 * 设置的企业uu号
-	 */
-	@Column(name = "ma_enuu")
-	private Long enuu;
-	
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_enuu", insertable = false, updatable = false)
-	private EnterpriseInfo enterprise;
-
-	/**
-	 * 设置人
-	 */
-	@Column(name = "ma_useruu")
-	private Long useruu;
-
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_useruu", insertable = false, updatable = false)
-	private UserBaseInfo userInfo;
-
-	/**
-	 * 时间
-	 */
-	@Column(name = "ma_date")
-	private Date date;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getAdenuu() {
-		return adenuu;
-	}
-
-	public void setAdenuu(Long adenuu) {
-		this.adenuu = adenuu;
-	}
-
-	public Long getEnuu() {
-		return enuu;
-	}
-
-	public void setEnuu(Long enuu) {
-		this.enuu = enuu;
-	}
-
-	public EnterpriseInfo getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(EnterpriseInfo enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public Long getUseruu() {
-		return useruu;
-	}
-
-	public void setUseruu(Long useruu) {
-		this.useruu = useruu;
-	}
-
-	public UserBaseInfo getUserInfo() {
-		return userInfo;
-	}
-
-	public void setUserInfo(UserBaseInfo userInfo) {
-		this.userInfo = userInfo;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-}

src/main/java/com/uas/platform/b2b/service/impl/ResourceServiceImpl.java

@@ -1,18 +1,14 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.Iterator;
-import java.util.List;
-
+import com.uas.platform.b2b.dao.ResourceDao;
+import com.uas.platform.b2b.model.Resource;
+import com.uas.platform.b2b.service.ResourceService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uas.platform.b2b.dao.MallAdministratorsDao;
-import com.uas.platform.b2b.dao.ResourceDao;
-import com.uas.platform.b2b.model.MallAdministrators;
-import com.uas.platform.b2b.model.Resource;
-import com.uas.platform.b2b.service.ResourceService;
-import com.uas.platform.b2b.support.SystemSession;
+import java.util.Iterator;
+import java.util.List;
 
 @Service
 public class ResourceServiceImpl implements ResourceService{
@@ -20,21 +16,14 @@ public class ResourceServiceImpl implements ResourceService{
 	@Autowired
 	private ResourceDao resourceDao;
 
-	@Autowired
-	private MallAdministratorsDao mallAdministratorsDao;
-
 	@Override
 	public List<Resource> findAll() {
-		List<MallAdministrators> admins = mallAdministratorsDao
-				.findByAdenuu(SystemSession.getUser().getEnterprise().getUu());
 		List<Resource> resources = resourceDao.findAll();
 		if (!CollectionUtils.isEmpty(resources)) {
-			if (CollectionUtils.isEmpty(admins)) {// 如果不存在商城管理员设置权限，这个不显示出来
-				for (Iterator<Resource> it = resources.iterator(); it.hasNext();) {
-					Resource re = it.next();
-					if (re.getName().equals("优软商城后台-管理")) {
-						it.remove();
-					}
+			for (Iterator<Resource> it = resources.iterator(); it.hasNext();) {
+				Resource re = it.next();
+				if (re.getName().equals("优软商城后台-管理")) {
+					it.remove();
 				}
 			}
 		}