fix --系统管理员唯一性校验

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

@@ -263,9 +263,10 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         map.put("doctorId", pDoctor.getId());
         map.put("hospitalId", pDoctor.getHospitalId().longValue());
         List<PermissionRole> roles = permissionRoleMapper.selectByDoctorId(map);
-        roles.stream().forEach(o -> {
-            resp.setRoleName(resp.getRoleName() + o.getRoleName() + " ");
-        });
+        for (PermissionRole role : roles) {
+            resp.setRoleName(resp.getRoleName() + role.getRoleName() + " ");
+        }
+
 
         // 获取批发资质
         StoreCertifyStatus storeCertifyStatus = null;

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

@@ -207,14 +207,13 @@
         </if>
     </select>
 
-    <select id="selectByDoctorId" resultMap="BaseResultMap" 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
+                 JOIN permission_role r on dr.role_id = r.id   and r.delete_flag = 1
         WHERE dr.delete_flag = 1
-          and dr.doctor_id = 1
-          AND dr.hospital_id = 2
-          and r.delete_flag = 1
+          and dr.doctor_id = #{doctorId ,jdbcType=BIGINT}
+          AND dr.hospital_id = #{hospitalId ,jdbcType=BIGINT}
     </select>
 </mapper>
\ No newline at end of file