lims后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
XiaoRuby
2023-07-17 0042c9bee29a876a754e4d542bfba956822e7844 
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java


@@ -3,7 +3,6 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.yuanchu.limslaboratory.pojo.User;


import com.yuanchu.limslaboratory.mapper.UserMapper;


@@ -13,13 +12,13 @@


import com.yuanchu.limslaboratory.vo.NewPersonnelVo;


import com.yuanchu.limslaboratory.vo.PagePersonnelVo;


import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.util.ObjectUtils;




import javax.annotation.Resource;


import java.util.HashMap;


import java.util.Map;


import java.util.Objects;




/**


 * <p>


@@ -74,12 +73,12 @@


    public User AccordingUsernameSelectAll(String account) {


        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();


        wrapper.eq(User::getAccount, account);


        wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount);


        wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount, User::getEnterpriseId);


        return userMapper.selectOne(wrapper);


    }




    @Override


    public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo) {


    public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {


        User user = new User()


                .setName(newPersonnelVo.getName())


                .setAccount(newPersonnelVo.getAccount())


@@ -87,7 +86,8 @@


                .setPhone(newPersonnelVo.getPhone())


                .setEmail(newPersonnelVo.getEmail())


                .setRoleId(newPersonnelVo.getRole_id())


                .setPassword(newPersonnelVo.getPassword());


                .setPassword(newPersonnelVo.getPassword())


                .setEnterpriseId(Integer.valueOf(enterpriseId));


        return userMapper.insert(user);


    }