Antiloveg лет назад: 8
Родитель
Сommit
bb3e62daaa

+ 17 - 0
schema/permission.sql

@@ -357,6 +357,23 @@ values
 (UUID(), '/api/admin/preview/honor', '文件预览--企业荣誉及其他证明材料预览授权'), 
 (UUID(), '/api/admin/preview/standard', '文件预览--标准制定情况附件预览授权');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/getBusinessCount', '高企认定--统计专利、软著及科技项目申报业务情况');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/permissionList', '系统设置--权限列表'),
+(UUID(), 'api/admin/roleList', '系统设置--角色列表');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/roles', '系统设置--获取角色下拉');
+
+
+
+
+
 
 
 

+ 2 - 0
src/main/java/com/goafanti/common/dao/RoleMapper.java

@@ -26,4 +26,6 @@ public interface RoleMapper {
 	int insertBatch(List<Role> records);
 
 	int deleteByPrimaryKeys(List<String> records);
+
+	List<RolePermissionBo> findRolePermissionsExceptAreaManager();
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/RoleMapper.xml

@@ -84,6 +84,13 @@
     left join permission tp on tp.id=trp.pid
     where tr.role_type <![CDATA[ < ]]> 999999
   </select>
+  <select id="findRolePermissionsExceptAreaManager" resultType="com.goafanti.permission.bo.RolePermissionBo">
+    select tr.id as rid, tr.role_name as rname, tr.role_type,tp.id as pid,tp.name as pname,tp.url
+    from role tr
+    left join role_permission trp on trp.rid=tr.id
+    left join permission tp on tp.id=trp.pid
+    where tr.role_type <![CDATA[ < ]]> 99999
+  </select>
   <select id="findRoleByUserId" resultType="java.lang.String">
     select tr.role_type from role tr
     left join user_role tur on tur.rid=tr.id

+ 8 - 1
src/main/java/com/goafanti/permission/service/impl/RoleServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.RoleMapper;
 import com.goafanti.common.dao.RolePermissionMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -42,7 +43,13 @@ public class RoleServiceImpl extends BaseMybatisDao<RoleMapper> implements RoleS
 
 	@Override
 	public List<RoleBo> findRoles() {
-		List<RolePermissionBo> res = roleMapper.findRolePermissions();
+		List<RolePermissionBo> res = null;
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+			 res = roleMapper.findRolePermissionsExceptAreaManager();
+		} else {
+			 res = roleMapper.findRolePermissions();
+		}
+		
 		Map<String, RoleBo> roleMap = new HashMap<>();
 		for (RolePermissionBo rp : res) {
 			RoleBo rb = roleMap.get(rp.getRid());