详情接口返回角色信息修改

server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountMapper.java

@@ -24,10 +24,10 @@ public interface AccountMapper {
     //新增账号
     void insertSelective(Account account);
 
-    Long insertSelectiveV2(Account account);
+    Long insertByOption(Account account);
 
     //更新账号
-    int updateByIdSelective(Account account);
+    Integer updateByIdSelective(Account account);
 
     //根据手机号获取账号
     Account getByMobilePhone(@Param("mobilePhone") String mobilePhone);

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

@@ -100,11 +100,11 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
                 Integer acctId = accountInfo.getId();
                 accountInfoDetailMapper.updateCreateInfo(acctId);
                 Account account = buildDoctorMsg(req, mobileEncrypt, currentTime, req.getSourceType(), password, acctId);
-                Long id = accountMapper.insertSelectiveV2(account);
+                accountMapper.insertByOption(account);
                 Long userId = account.getId();
                 processAgreement(userId);
                 insertAppRole(userId);
-                insertSaasRole(req, id, userId);
+                insertSaasRole(req, account.getId(), userId);
                 redisClient.del(nxKey);
                 return 1;
             }

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

@@ -34,7 +34,7 @@
         <result column="card" jdbcType="VARCHAR" property="card"/>
         <result column="birthday" jdbcType="DATE" property="birthday"/>
         <result column="hospital_id" jdbcType="INTEGER" property="hospitalId"/>
-        <result column="hospital" jdbcType="VARCHAR" property="hospital" />
+        <result column="hospital" jdbcType="VARCHAR" property="hospital"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -50,8 +50,7 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
 
-    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.Account"
-            useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.Account">
         insert into p_doctor
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sex != null">
@@ -214,8 +213,7 @@
             </if>
         </trim>
     </insert>
-    <insert id="insertSelectiveV2" parameterType="com.pica.cloud.account.account.server.entity.Account"
-            useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertByOption" useGeneratedKeys="true" keyProperty="id">
         insert into p_doctor
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sex != null">
@@ -559,8 +557,9 @@
                pr.id          as roleId,
                pr.role_name   as roleName
         from p_doctor as p
-         left join permission_doctor_role as pdr ON p.id = pdr.doctor_id and p.hospital_id = pdr.hospital_id and  pdr.delete_flag = 1
-         left join permission_role as pr ON pdr.role_id = pr.id and pr.delete_flag = 1
+                 left join permission_doctor_role as pdr
+                           ON p.id = pdr.doctor_id and p.hospital_id = pdr.hospital_id and pdr.delete_flag = 1
+                 left join permission_role as pr ON pdr.role_id = pr.id and pr.delete_flag = 1
         where p.id = #{id, jdbcType=INTEGER}
         limit 1
     </select>