Merge branch 'master' of http://122.237.99.185:3000/dcs/realty

virgo.core/src/main/java/com/bosshand/virgo/core/dao/MgrResourceDao.java

@@ -1,10 +1,9 @@
 package com.bosshand.virgo.core.dao;
 
-import java.util.List;
-
+import com.bosshand.virgo.core.model.MgrResource;
 import org.apache.ibatis.annotations.Mapper;
 
-import com.bosshand.virgo.core.model.MgrResource;
+import java.util.List;
 
 @Mapper
 public interface MgrResourceDao {
@@ -13,7 +12,7 @@ public interface MgrResourceDao {
 	
 	public List<MgrResource> getList();
 	
-	public int get(long id);
+	public MgrResource get(long id);
 	
 	public int insert(MgrResource MgrResource);
 	

virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrOrganization.java

@@ -56,6 +56,11 @@ public class MgrOrganization implements BaseModel {
 
     private String organizationCode;
 
+    /**
+     * 是否服务商
+     */
+    private int facilitator;
+
     public long getId() {
         return id;
     }
@@ -168,4 +173,11 @@ public class MgrOrganization implements BaseModel {
         this.organizationCode = organizationCode;
     }
 
+    public int getFacilitator() {
+        return facilitator;
+    }
+
+    public void setFacilitator(int facilitator) {
+        this.facilitator = facilitator;
+    }
 }

virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrUserRole.java

@@ -24,6 +24,16 @@ public class MgrUserRole implements BaseModel {
 	 */
 	private String resources;
 
+	/**
+	 * workark菜单
+	 */
+	private String workarkMenus;
+
+	/**
+	 * workark资源
+	 */
+	private String workarkResources;
+
 	/**
 	 * 部门角色
 	 */
@@ -71,6 +81,22 @@ public class MgrUserRole implements BaseModel {
 		this.resources = resources;
 	}
 
+	public String getWorkarkMenus() {
+		return workarkMenus;
+	}
+
+	public void setWorkarkMenus(String workarkMenus) {
+		this.workarkMenus = workarkMenus;
+	}
+
+	public String getWorkarkResources() {
+		return workarkResources;
+	}
+
+	public void setWorkarkResources(String workarkResources) {
+		this.workarkResources = workarkResources;
+	}
+
 	public String getRoles() {
 		return roles;
 	}

virgo.core/src/main/java/com/bosshand/virgo/core/model/UserContext.java

@@ -51,6 +51,10 @@ public class UserContext implements BaseModel{
 	private String resource;
 	
 	private String menu;
+
+	private String workarkResource;
+
+	private String workarkMenu;
 	
 	private boolean admin;
 
@@ -136,6 +140,22 @@ public class UserContext implements BaseModel{
 		this.menu = menu;
 	}
 
+	public String getWorkarkResource() {
+		return workarkResource;
+	}
+
+	public void setWorkarkResource(String workarkResource) {
+		this.workarkResource = workarkResource;
+	}
+
+	public String getWorkarkMenu() {
+		return workarkMenu;
+	}
+
+	public void setWorkarkMenu(String workarkMenu) {
+		this.workarkMenu = workarkMenu;
+	}
+
 	public boolean isAdmin() {
 		return admin;
 	}
@@ -286,6 +306,9 @@ public class UserContext implements BaseModel{
 				flowUser.setAdmin(userRole.isAdmin());
 				flowUser.setMenu(userRole.getMenus());
 				flowUser.setResource(userRole.getResources());
+
+				flowUser.setWorkarkMenu(userRole.getWorkarkMenus());
+				flowUser.setWorkarkResource(userRole.getWorkarkResources());
 			}
 			flowUser.setUserRole(userRole);
 

virgo.core/src/main/java/com/bosshand/virgo/core/service/MgrUserService.java

@@ -334,7 +334,11 @@ public class MgrUserService {
 	}
 
 	public MgrResource getDefaultResource() {
-		return mgrResourceDao.defaultResource();
+		return mgrResourceDao.get(2);
+	}
+
+	public MgrResource getWorkarkDefaultResource() {
+		return mgrResourceDao.get(3);
 	}
 
 	private Boolean contains(List<MgrOrganization> organizationList, MgrOrganization currentOrganization) {
@@ -390,14 +394,23 @@ public class MgrUserService {
     	if(currentUserRole!= null && currentOrganization!=null && currentUserRole.isAdmin()) {
     		String resources = "";
     		String menus = "";
+			String workarkResources = "";
+			String workarkMenus = "";
     		if(currentUserRole.getOrganizationId() == -1) {
     			MgrResource resource = getDefaultResource();
     			if(resource != null) {
     				resources = resource.getData();
     				menus = resource.getComment();
     			}
+				MgrResource workarkDefaultResource = getWorkarkDefaultResource();
+				if(workarkDefaultResource != null) {
+					workarkResources = workarkDefaultResource.getData();
+					workarkMenus = workarkDefaultResource.getComment();
+				}
 				currentUserRole.setResources(resources);
 				currentUserRole.setMenus(menus);
+				currentUserRole.setWorkarkResources(workarkResources);
+				currentUserRole.setWorkarkMenus(workarkMenus);
 			}
     	}
 

virgo.core/src/main/resources/mapper/MgrOrganizationMapper.xml

@@ -17,6 +17,7 @@
 	<result column="status" property="status"/>
 	<result column="organizedDataCenter" property="organizedDataCenter"/>
 	<result column="organizationCode" property="organizationCode"/>
+	<result column="facilitator" property="facilitator"/>
 </resultMap>
 
 <select id="getById" resultMap="MgrOrganizationResult">
@@ -92,8 +93,8 @@
 </select>
 
 <insert id="insert" parameterType="com.bosshand.virgo.core.model.MgrOrganization" useGeneratedKeys="true" keyProperty="id">
-	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode)
-	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode})
+	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode, facilitator)
+	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode}, #{facilitator})
 </insert>
 
 <update id="update" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
@@ -109,6 +110,7 @@
 		<if test="introduction!=null">introduction=#{introduction},</if>
 		<if test="registerDate!=null">registerDate=#{registerDate},</if>
 		<if test="organizedDataCenter!=0">organizedDataCenter=#{organizedDataCenter},</if>
+		<if test="facilitator!=0">facilitator=#{facilitator},</if>
 	</trim>
 	WHERE id=#{id}
 </update>

virgo.core/src/main/resources/mapper/MgrUserRoleMapper.xml

@@ -9,7 +9,9 @@
 	<result column="userId" property="userId"/>	
 	<result column="organizationId" property="organizationId"/>	
 	<result column="menus" property="menus"/>	
-	<result column="resources" property="resources"/>	
+	<result column="resources" property="resources"/>
+	<result column="workarkMenus" property="workarkMenus"/>
+	<result column="workarkResources" property="workarkResources"/>
 	<result column="roles" property="roles"/>
 	<result column="admin" property="admin"/>
 </resultMap>
@@ -31,8 +33,8 @@
 </select>
 		
 <insert id="insert" parameterType="com.bosshand.virgo.core.model.MgrUserRole" useGeneratedKeys="true" keyProperty="id">
-	INSERT into mgr_user_role(userId, organizationId, menus, resources, roles, admin)
-	values(#{userId}, #{organizationId}, #{menus}, #{resources}, #{roles} ,#{admin})
+	INSERT into mgr_user_role(userId, organizationId, menus, resources, workarkMenus, workarkResources, roles, admin)
+	values(#{userId}, #{organizationId}, #{menus}, #{resources}, #{workarkMenus}, #{workarkResources}, #{roles} ,#{admin})
 </insert>	
 
 <update id="update" parameterType="com.bosshand.virgo.core.model.MgrUserRole">
@@ -42,6 +44,8 @@
 			<if test="organizationId!=null">organizationId=#{organizationId},</if>
 			<if test="menus!=null">menus=#{menus},</if>
 			<if test="resources!=null">resources=#{resources},</if>
+			<if test="workarkMenus!=null">workarkMenus=#{workarkMenus},</if>
+			<if test="workarkResources!=null">workarkResources=#{workarkResources},</if>
 			<if test="roles!=null">roles=#{roles},</if>
 			<if test="admin!=null">admin=#{admin},</if>
 		</trim>		
@@ -53,6 +57,8 @@
 		<trim prefix="set" suffixOverrides=",">
 			<if test="menus!=null">menus=#{menus},</if>
 			<if test="resources!=null">resources=#{resources},</if>
+			<if test="workarkMenus!=null">workarkMenus=#{workarkMenus},</if>
+			<if test="workarkResources!=null">workarkResources=#{workarkResources},</if>
 			<if test="roles!=null">roles=#{roles},</if>
 		</trim>		
 	WHERE userId=#{userId} and organizationId=#{organizationId}

virgo.manager/src/main/java/com/bosshand/virgo/service/ResourceService.java

@@ -18,7 +18,7 @@ public class ResourceService {
 		return mgrResourceDao.getList();
 	}
 	
-	public int get(long id) {
+	public MgrResource get(long id) {
 		return mgrResourceDao.get(id);
 	}