表新增字段

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java

@@ -40,6 +40,16 @@ public class GovRoleDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+
+	/**
+	 * 是否是默认角色【0:否  1:是】  默认角色不能删除
+	 */
+	private String isDefault;
+
     /**
      * 角色名称
      */

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java

@@ -39,6 +39,11 @@ public class GovRoleMenuDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+
     /**
      * 角色ID
      */

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java

@@ -39,6 +39,11 @@ public class GovRoleUserDTO implements Serializable {
      */
 	private String id;
 
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+
     /**
      * 角色ID
      */

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java

@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -51,7 +53,8 @@ public class GovRoleController {
     private GovRoleMenuService govRoleMenuService;
 
     @GetMapping("page")
-    public Result<PageData<GovRoleDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GovRoleDTO>> page(@LoginUser TokenDto tokenDto, @RequestParam Map<String, Object> params){
+        params.put("customerId",tokenDto.getCustomerId());
         PageData<GovRoleDTO> page = govRoleService.page(params);
         return new Result<PageData<GovRoleDTO>>().ok(page);
     }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java

@@ -41,4 +41,14 @@ public class GovRoleEntity extends BaseEpmetEntity {
 	@TableField(fill = FieldFill.INSERT)
 	private Long deptId;
 
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+
+	/**
+	 * 是否是默认角色【0:否  1:是】  默认角色不能删除
+	 */
+	private String isDefault;
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java

@@ -33,4 +33,9 @@ public class GovRoleMenuEntity extends BaseEpmetEntity {
 	 */
 	private String menuId;
 
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java

@@ -34,4 +34,9 @@ public class GovRoleUserEntity extends BaseEpmetEntity {
 	 */
 	private String userId;
 
+	/**
+	 * 客户id
+	 */
+	private String customerId;
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GovRoleMenuDao;
 import com.epmet.dto.GovRoleMenuDTO;
@@ -51,6 +52,9 @@ public class GovRoleMenuServiceImpl extends BaseServiceImpl<GovRoleMenuDao, GovR
     private GovRoleMenuRedis govRoleMenuRedis;
     @Autowired
     private GovRoleMenuDao govRoleMenuDao;
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
 
     @Override
     public PageData<GovRoleMenuDTO> page(Map<String, Object> params) {
@@ -125,6 +129,7 @@ public class GovRoleMenuServiceImpl extends BaseServiceImpl<GovRoleMenuDao, GovR
             GovRoleMenuEntity govRoleMenuEntity = new GovRoleMenuEntity();
             govRoleMenuEntity.setMenuId(menuId);
             govRoleMenuEntity.setRoleId(roleId);
+            govRoleMenuEntity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
             //保存
             insert(govRoleMenuEntity);

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.GovRoleDao;
@@ -74,8 +76,10 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
     private QueryWrapper<GovRoleEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
         String name = (String)params.get(FieldConstant.NAME_HUMP);
+        String customerId = (String)params.get(FieldConstant.CUSTOMER_ID_HUMP);
         QueryWrapper<GovRoleEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name)
+                .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID_HUMP, customerId);
 
         return wrapper;
     }
@@ -107,7 +111,11 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
+        //查询角色信息，管理员角色不允许删除
+        GovRoleEntity entity = baseDao.selectById(ids[NumConstant.ZERO]);
+        if (null != entity && "管理员".equals(entity.getName())) {
+            throw new RenException("9999", "管理员角色为默认角色，不允许删除");
+        }
         baseDao.deleteBatchIds(Arrays.asList(ids));
 
         govRoleMenuService.deleteByRoleIds(ids);