fix --添加默认角色枚举类

server/src/main/java/com/pica/cloud/account/account/server/enums/SaasRoleEnum.java

@@ -9,15 +9,15 @@ import lombok.Getter;
  */
 @Getter
 public enum SaasRoleEnum {
-    NULL_ROLE(0,"无角色信息"),
-    MAIN_ADMIN_ROLE(1, "主管理员"),
-    ADMIN_ROLE(2, "管理员"),
-    SAAS_MAIN_ADMIN(3, "saas系统管理员"),
-    SAAS_DOCTOR(4,"开单医生");
-    private int code;
+    NULL_ROLE(0L,"无角色信息"),
+    MAIN_ADMIN_ROLE(1L, "主管理员"),
+    ADMIN_ROLE(2L, "管理员"),
+    SAAS_MAIN_ADMIN(3L, "saas系统管理员"),
+    SAAS_DOCTOR(4L,"开单医生");
+    private Long code;
     private String msg;
 
-    SaasRoleEnum(int code, String msg) {
+    SaasRoleEnum(Long code, String msg) {
         this.code = code;
         this.msg = msg;
     }

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserReq.java

@@ -42,10 +42,10 @@ public class HospitalSaasUserReq {
     @ApiModelProperty("角色id  0 无角色 1 主管理员 2 管理员 3 saas系统管理员 4 开单医生")
     private Long roleId;
 
-    @ApiModelProperty("产品类型")
+    @ApiModelProperty("产品类型 1.云鹊医 2.云鹊健康 3.SAAS")
     private Integer productType;
 
-    @ApiModelProperty("资源类型")
+    @ApiModelProperty("资源类型 1表示安卓，2表示ios，3表示web，4表示H5登录，5表示admin后台 6.SAAS")
     private Integer sourceType;
 
     public void checkInsertParams() {

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalSaasUserDto.java

@@ -23,7 +23,7 @@ public class HospitalSaasUserDto {
     @ApiModelProperty("备注")
     private String comment;
     @ApiModelProperty("角色id")
-    private Integer roleId;
+    private Long roleId;
     @ApiModelProperty("角色名称")
     private String roleName;
     @ApiModelProperty("saas系统管理员标识   0 不是 1是")

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasRoleServiceImpl.java

@@ -75,7 +75,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
 
     @Override
     public HospitalRoleResp listByPage(HospitalRoleListReq req) {
-        List<Integer> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode());
+        List<Long> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode());
         Map<String, Object> map = new HashMap(4);
         map.put("list", list);
         map.put("name", req.getName());
@@ -86,11 +86,13 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         map.put("pageNo", (req.getPageNo() - 1) * req.getPageSize());
         map.put("pageSize", req.getPageSize());
         List<HospitalRoleDto> roleDtos = permissionRoleMapper.listByPage(map);
-        roleDtos.stream().forEach(t -> {
-            if (Objects.equals(t.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
-                t.setAdminSaasFlag(1);
+
+        for (HospitalRoleDto roleDto : roleDtos) {
+            if (Objects.equals(roleDto.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
+                roleDto.setAdminSaasFlag(1);
+            }
         }
-        });
+
         return new HospitalRoleResp(roleDtos, count);
     }
 

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -192,7 +192,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "参数错误");
         }
         int count = accountMapper.adminRoleCountByhospitalId(req.getHospitalId().longValue());
-        if (count >= 1 && null != req.getRoleId() && SaasRoleEnum.SAAS_MAIN_ADMIN.getCode() == req.getRoleId()) {
+        if (count >= 1 && null != req.getRoleId() &&   Objects.equals(req.getRoleId(),SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前已存在系统管理员,请勿重复设置");
         }
         if (accountExist == null) {