fix用户删除后删除相应的关联角色

nb-system/src/main/java/com/nb/bus/service/LocalBusPatientService.java

@@ -395,11 +395,13 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         String originInfusionId = patient.getInfusionId();
         //现在的主输注
         String masterDeviceId = shiftConfig.getMasterDeviceId();
-        if(ObjectUtil.equal(originInfusionId,masterDeviceId)){
+
+        BusInfusionHistoryEntity masterInfusion = infusionHistoryService.lastInfusion(masterDeviceId);
+        if(ObjectUtil.equal(originInfusionId,masterInfusion.getId())){
             return;
         }
 
-        BusInfusionHistoryEntity masterInfusion = infusionHistoryService.lastInfusion(masterDeviceId);
+
 
         //病患绑定主泵信息
         this.update(new UpdateWrapper<BusPatientEntity>().lambda()

nb-system/src/main/java/com/nb/system/controller/SysUserController.java

@@ -71,8 +71,8 @@ public class SysUserController {
     @PostMapping("/remove")
     @SaCheckPermission("system:sysUser:remove")
     @Log(title = "用户管理删除")
-    public R remove(@RequestParam String ids) {
-        sysUserService.remove(ids);
+    public R remove(@RequestParam String id) {
+        sysUserService.remove(id);
         return R.success();
     }
 

nb-system/src/main/java/com/nb/system/service/impl/SysUserServiceImpl.java

@@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -243,14 +244,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void remove(String ids) {
-        List<String> idList = Arrays.asList(ids.split(","));
-        idList.forEach(item -> {
-            if (SecurityUtil.isSysSuperAdmin(Long.valueOf(item))) {
-                throw new CustomException("超管账户不允许删除");
-            }
-        });
-        this.removeByIds(idList.stream().map(Long::valueOf).collect(Collectors.toSet()));
+    public void remove(String id) {
+        sysUserRoleService.remove(new QueryWrapper<SysUserRole>()
+                .lambda().eq(SysUserRole::getUserId,id));
+        this.removeById(id);
     }
 
     @Override