部分修复

value

2024-06-08 946e8e2afb1a683c7b17bf52446a13e3c10b140a

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -13,6 +13,7 @@
import com.yuanchu.mom.mapper.RoleMapper;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Custom;
import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.CustomService;
import com.yuanchu.mom.service.UserService;
@@ -26,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class UserServiceImp implements UserService {
@@ -107,7 +109,10 @@

    @Override
    public List<User> getUserMenu() {
        return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
        List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery().ne(Role::getCategory, 10003)).stream().map(Role::getId).distinct().collect(Collectors.toList());
        return userMapper.selectList(Wrappers.<User>lambdaQuery()
                .in(User::getRoleId, roleIds)
                .eq(User::getState, 1).select(User::getName, User::getId));
    }

    //获取设备负责人
@@ -159,6 +164,7 @@
                user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
                user.setAddress("未填写");
                user.setRoleId(personDto.getRoleId()>10000?0:personDto.getRoleId());
                user.setCompanyId(person.getCompanyId());
                userMapper.insert(user);
            } else {
                user.setName(person.getName());
@@ -170,6 +176,7 @@
                user.setCreateTime(null);
                user.setUpdateUser(null);
                user.setUpdateTime(null);
                user.setCompanyId(person.getCompanyId());
                userMapper.updateById(user);
            }
        });