Procházet zdrojové kódy

修改角色绑定用户操作

ljx před 4 roky
rodič
revize
c98745f296

+ 2 - 1
src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupSetServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -258,7 +259,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
      * @return
      */
     @Override
-    public List<AccountIncomeSetVO> getIncomeAccountStatus(Long id, Long hospId) {
+    public List<AccountIncomeSetVO> getIncomeAccountStatus(@RequestParam(value = "id")Long id, Long hospId) {
 
         CostIncomeGroupSet incomeGroupSet = this.getById(id);
         if (Objects.isNull(incomeGroupSet)){

+ 1 - 7
src/main/java/com/imed/costaccount/service/impl/UserRoleServiceImpl.java

@@ -3,21 +3,16 @@ package com.imed.costaccount.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.UserRoleMapper;
 import com.imed.costaccount.model.UserRole;
 import com.imed.costaccount.model.dto.RoleUserDTO;
-import com.imed.costaccount.model.vo.CommonSelectVO;
 import com.imed.costaccount.model.vo.CommonVO;
-import com.imed.costaccount.model.vo.UserVO;
 import com.imed.costaccount.service.UserRoleService;
 import com.imed.costaccount.service.UserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -69,8 +64,7 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
 //        this.removeById(roleId);
         List<Long> userIds = roleUserDTO.getUserIds();
         this.remove(
-                new LambdaQueryWrapper<UserRole>().in(UserRole::getUserId, userIds).eq(UserRole::getRoleId, roleId)
-        );
+                new LambdaQueryWrapper<UserRole>().eq(UserRole::getRoleId, roleId));
         if (CollUtil.isNotEmpty(userIds)) {
             List<UserRole> userRoles = userIds.stream().map(i -> {
                 UserRole userRole = new UserRole();