fix: 删除角色

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

@@ -33,7 +33,7 @@ public interface PermissionDoctorRoleMapper {
 
     List<PermissionDoctorRole> selectByRoleId(Long id);
 
-    int upsertDefaultRole(Map<String, Object> map);
+    int deleteByRoleId(Map<String, Object> map);
 
     List<PermissionDoctorRole> queryDoctorMenu(Integer doctorId);
 

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

@@ -98,7 +98,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), "请输入角色id");
         }
 
-        if (id == 1 || id == 2 || id == 3) {
+        if (id <= 4) {
             throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), "该角色无法删除");
         }
 
@@ -107,7 +107,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         map.put("modifiedId", user.getId());
         map.put("modifiedTime", new Date());
         permissionRoleMapper.deleteById(map);
-        permissionDoctorRoleMapper.upsertDefaultRole(map);
+        permissionDoctorRoleMapper.deleteByRoleId(map);
         return 1;
     }
 

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

@@ -170,10 +170,9 @@
         where doctor_id = #{id,jdbcType=BIGINT}
     </update>
 
-    <update id="upsertDefaultRole" parameterType="java.util.Map">
+    <update id="deleteByRoleId" parameterType="java.util.Map">
         update permission_doctor_role
         set delete_flag   = 2,
-            # role_id       = 4,
             modified_id   = #{modifiedId,jdbcType=BIGINT},
             modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
         where role_id = #{id,jdbcType=BIGINT}