新增公司

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java

@@ -73,6 +73,10 @@ public class SysDept extends BaseEntity {
      * 父部门名称
      */
     private String parentName;
+
+    //权限模版ID
+    private Long templateId;
+
     /**
      * 省
      */
@@ -115,6 +119,14 @@ public class SysDept extends BaseEntity {
 
     private String keyWord;
 
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+
     public void setCity(String city) {
         this.city = city;
     }

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysMenu.java

@@ -72,6 +72,8 @@ public class SysMenu extends BaseEntity
     /** 系统类型 */
     private String systemType;
 
+    private Long templateId;
+
     public Long getMenuId()
     {
         return menuId;
@@ -247,6 +249,14 @@ public class SysMenu extends BaseEntity
         this.systemType = systemType;
     }
 
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java

@@ -9,8 +9,10 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.bonus.system.api.domain.SysDept;
 import com.bonus.system.api.domain.SysMenu;
 import com.bonus.system.domain.UserMenuParams;
+import com.bonus.system.mapper.SysDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.common.core.constant.Constants;
@@ -45,6 +47,9 @@ public class SysMenuServiceImpl implements ISysMenuService
     @Autowired
     private SysRoleMenuMapper roleMenuMapper;
 
+    @Autowired
+    private SysDeptMapper deptMapper;
+
     /**
      * 根据用户查询系统菜单列表
      * 
@@ -70,6 +75,8 @@ public class SysMenuServiceImpl implements ISysMenuService
             String str = menu.getMenuName().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_");
             menu.setMenuName(str);
         }
+        SysDept sysDept = deptMapper.selectDeptById(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
+        menu.setTemplateId(sysDept.getTemplateId());
         List<SysMenu> menuList = menuMapper.selectMenuList(menu);
         return menuList;
     }

bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="templateId" column="template_id" />
 		<result property="province" column="province" />
 		<result property="city" column="city" />
 		<result property="district" column="district" />
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.del_flag,
                d.create_by,
                d.create_time,
+               d.template_id,
                d.province,
                d.city,
                d.district,

bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -29,21 +29,27 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time, system_type
+		select sm.menu_id, sm.menu_name, sm.parent_id, sm.order_num, sm.path, sm.component, sm.`query`, sm.is_frame,
-		from sys_menu
+			   sm.is_cache, sm.menu_type, sm.visible, sm.status, ifnull(sm.perms,'') as perms, sm.icon, sm.create_time, sm.system_type
+		from sys_menu sm
     </sql>
     
     <select id="selectMenuList" parameterType="com.bonus.system.api.domain.SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		<where>
 			<if test="menuName != null and menuName != ''">
-				AND menu_name like concat('%', #{menuName}, '%')
+				AND sm.menu_name like concat('%', #{menuName}, '%')
 			</if>
 			<if test="visible != null and visible != ''">
-				AND visible = #{visible}
+				AND sm.visible = #{visible}
 			</if>
 			<if test="status != null and status != ''">
-				AND status = #{status}
+				AND sm.status = #{status}
+			</if>
+			<if test="templateId != null">
+				and exists (
+					select 0 from sys_template_menu stm where stm.temp_id = #{templateId} and stm.menu_id = sm.menu_id
+				)
 			</if>
 		</where>
 		order by parent_id, order_num
@@ -132,7 +138,7 @@
 	
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
-		where menu_id = #{menuId}
+		where sm.menu_id = #{menuId}
 	</select>
 	
 	<select id="hasChildByMenuId" resultType="Integer">
@@ -141,7 +147,7 @@
 	
 	<select id="checkMenuNameUnique" parameterType="com.bonus.system.api.domain.SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
-		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
+		where sm.menu_name=#{menuName} and sm.parent_id = #{parentId} limit 1
 	</select>
 
 	<update id="updateMenu" parameterType="com.bonus.system.api.domain.SysMenu">