ソースを参照

修改角色和创建角色的激活小程序字段入参保持统一

v_HuilingDeng 3 年 前
コミット
1726e8af56

+ 1 - 1
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateRoleReq.java

@@ -31,6 +31,6 @@ public class UpdateRoleReq implements Serializable {
   private List<String> resourceCodeList;
 
   @ApiModelProperty(value = "激活小程序资源列表(里面只会有2种code: 1-主账号 2-子账号)")
-  private Integer activateMiniAppResourceCode;
+  private List<Integer> activateMiniAppResourceCodeList;
 
 }

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/RoleManagerServiceImpl.java

@@ -211,8 +211,9 @@ public class RoleManagerServiceImpl implements RoleManagerService {
         userResourceService.saveUserResourceMapping(userRole.getRoleCode(),req.getResourceCodeList());
 
         //4-保存角色明细
-        int isMainAccount = ActivateMiniAppRoleResourceEnum.MAIN.is(req.getActivateMiniAppResourceCode())?1:0;
-        int isSubAccount = ActivateMiniAppRoleResourceEnum.SUB.is(req.getActivateMiniAppResourceCode())?1:0;
+        List<Integer> miniList = req.getActivateMiniAppResourceCodeList();
+        int isMainAccount = miniList!=null && miniList.contains(ActivateMiniAppRoleResourceEnum.MAIN.getCode())?1:0;
+        int isSubAccount = miniList!=null && miniList.contains(ActivateMiniAppRoleResourceEnum.SUB.getCode())?1:0;
         saveRoleDetail(userRole.getRoleCode(),isMainAccount,isSubAccount);
     }