修改人员角色显示逻辑

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

@@ -22,4 +22,7 @@ public class HospitalRoleListReq {
     @ApiModelProperty("页码")
     private Integer pageNo = 1;
 
+    @ApiModelProperty("登录来源  0:saas 1:运营平台")
+    private Integer loginFlag = 0;
+
 }

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

@@ -49,8 +49,6 @@ public class HospitalSaasUserReq {
     @ApiModelProperty("资源类型 1表示安卓，2表示ios，3表示web，4表示H5登录，5表示admin后台 6.SAAS")
     private Integer sourceType;
 
-    @ApiModelProperty("登录来源  0:saas 1:运营平台")
-    private Integer loginFlag = 0;
     public void checkInsertParams() {
         if (StringUtils.isBlank(this.mobile)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号不能为空");

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

@@ -30,6 +30,4 @@ public class HospitalSaasUserDto {
     private Long roleId;
     @ApiModelProperty("角色名称")
     private String roleName;
-    @ApiModelProperty("saas系统管理员标识   0 不是 1是")
-    private Integer adminSaasFlag = 0;
 }

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

@@ -89,9 +89,11 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
 
     @Override
     public HospitalRoleResp listByPage(HospitalRoleListReq req) {
-        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);
+        if (req.getLoginFlag() == 1) {
+            List<Long> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode());
+            map.put("list", list);
+        }
         map.put("name", req.getName());
         int count = permissionRoleMapper.listCountByPage(map);
         if (count < 1) {

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

@@ -171,12 +171,6 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             String phone = EncryptUtils.decryptContent(t.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             String mixMobile = mixMobile(phone);
             t.setMobile(mixMobile);
-            if (req.getLoginFlag() == 0 && Objects.nonNull(t.getRoleId()) && t.getRoleId() < SaasRoleEnum.SAAS_DOCTOR.getCode()) {
-                t.setAdminSaasFlag(1);
-            }
-            if (req.getLoginFlag() == 1 && Objects.nonNull(t.getRoleId()) && t.getRoleId() < SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) {
-                t.setAdminSaasFlag(1);
-            }
         });
         return new HospitalSaasUserResp(lists, count);
     }

server/src/main/resources/mybatis/PermissionRoleMapper.xml

@@ -37,7 +37,8 @@
                 #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=BIGINT}, #{createdTime,jdbcType=TIMESTAMP},
                 #{modifiedId,jdbcType=BIGINT}, #{modifiedTime,jdbcType=TIMESTAMP})
     </insert>
-    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.PermissionRole" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.PermissionRole"
+            useGeneratedKeys="true" keyProperty="id">
         insert into permission_role
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -181,7 +182,7 @@
     <select id="querySaasRoles" resultType="com.pica.cloud.account.account.server.resp.RoleDto">
         select p.id as id, p.role_name as name
         from permission_role as p
-        where p.id not in (1, 2)  and  p.delete_flag = 1
+        where p.delete_flag = 1
     </select>
 
 
@@ -207,11 +208,12 @@
         </if>
     </select>
 
-    <select id="selectByDoctorId" resultType="com.pica.cloud.account.account.server.entity.PermissionRole"  parameterType="java.util.Map">
+    <select id="selectByDoctorId" resultType="com.pica.cloud.account.account.server.entity.PermissionRole"
+            parameterType="java.util.Map">
         select r.role_code as roleCode,
                r.role_name as roleName
         from permission_doctor_role dr
-                 JOIN permission_role r on dr.role_id = r.id   and r.delete_flag = 1
+                 JOIN permission_role r on dr.role_id = r.id and r.delete_flag = 1
         WHERE dr.delete_flag = 1
           and dr.doctor_id = #{doctorId ,jdbcType=BIGINT}
           AND dr.hospital_id = #{hospitalId ,jdbcType=BIGINT}