Fixiaobai
2023-08-28 1865de1cd0255f7c42a326018a8cc3b5a1ee5253
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -59,11 +59,9 @@
            Map<String, Object> data = new HashMap<>();
            data.put("name",loginUser.get("name"));
            data.put("id",loginUser.get("id"));
            data.put("roleId",loginUser.get("roleId"));
            data.put("remind", remind);
            RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
            System.out.println("+++++++++++++++++++++++++++++++++++++++++++++");
            System.out.println(role);
            System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
            data.put("role",role);
            return data;
        }
@@ -101,6 +99,11 @@
    }
    @Override
    public RoleAndMenuDto getUserRoleInfo(String token) {
        return null;
    }
    @Override
    public Map<String, String> selectUserByUserId(int userId) {
        return userMapper.selectUserByUserId(userId);
    }
@@ -126,23 +129,20 @@
    @Override
    public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
        User user = new User()
                .setName(updatePersonnelVo.getName())
                .setAccount(updatePersonnelVo.getAccount())
                .setAge(String.valueOf(updatePersonnelVo.getAge()))
                .setPhone(updatePersonnelVo.getPhone())
                .setEmail(updatePersonnelVo.getEmail())
                .setRoleId(updatePersonnelVo.getRole_id())
                .setPassword(updatePersonnelVo.getPassword())
                .setJobState(updatePersonnelVo.getJobState());
        LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(User::getId, updatePersonnelVo.getId());
        return userMapper.update(user, updateWrapper);
        try {
            MyUtil.PrintLog(updatePersonnelVo.toString());
            User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);
            LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.eq(User::getId, updatePersonnelVo.getId());
            return userMapper.update(unmarshal, updateWrapper);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }
    @Override
    public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
        MyUtil.PrintLog(name + status + "=============");
        return userMapper.getNewPersonnelPage(name, page, status);
    }