Przeglądaj źródła

修复角色的bug

lixing 4 lat temu
rodzic
commit
4c9bce0d33

+ 2 - 13
fm-person/src/main/java/com/persagy/fm/saas/role/model/SaasRole.java

@@ -1,5 +1,6 @@
 package com.persagy.fm.saas.role.model;
 
+import com.persagy.fm.saas.common.model.dto.SaasBaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(description = "")
-public class SaasRole implements Serializable {
+public class SaasRole extends SaasBaseDTO {
     private static final long serialVersionUID = -13451619873751031L;
 
     @ApiModelProperty("主键")
@@ -25,24 +26,12 @@ public class SaasRole implements Serializable {
     @ApiModelProperty("角色编码")
     private String roleCode;
 
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
     @ApiModelProperty("角色名称")
     private String roleName;
 
     @ApiModelProperty("角色类型")
     private String roleType;
 
-    @ApiModelProperty("账号所属")
-    private String accountBelong;
-
-    @ApiModelProperty("账号id")
-    private String accountId;
-
-    @ApiModelProperty("应用id")
-    private String appId;
-
     @ApiModelProperty("备注")
     private String remark;
 

+ 3 - 1
fm-person/src/main/java/com/persagy/fm/saas/role/service/impl/SaasRoleServiceImpl.java

@@ -72,12 +72,13 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
     public void updateSaasRole(UpdateSaasRoleDTO updateSaasRoleDTO) {
         // 查询要更新的对象
         SaasRole saasRole = getSaasRole(updateSaasRoleDTO.getId());
+
         if (saasRole == null) {
             throw new IllegalArgumentException("找不到要更新的数据,id: " + updateSaasRoleDTO.getId());
         }
         // 将更新的属性赋值给查询到的对象
         saasRole = ConvertSaasRoleTool.INSTANCE.convertUpdateDto2Entity(saasRole, updateSaasRoleDTO);
-
+        saasRole.setDefaultValue();
         saasRoleClient.updateSaasRole(saasRole);
     }
 
@@ -135,6 +136,7 @@ public class SaasRoleServiceImpl implements ISaasRoleService {
         checkDeletable(id);
         // 删除角色
         DeleteSaasRoleDTO deleteSaasRoleDTO = new DeleteSaasRoleDTO();
+        deleteSaasRoleDTO.setDefaultValue();
         deleteSaasRoleDTO.setId(id);
         saasRoleClient.deleteSaasRole(deleteSaasRoleDTO);
     }