From 56752f7245347424762514dfa0c55f1968ab1d5e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 16 五月 2024 22:41:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 5f307a2..92bf542 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.PersonDto;
 import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.exception.ErrorException;
 import com.yuanchu.mom.mapper.UserMapper;
@@ -13,30 +14,33 @@
 import com.yuanchu.mom.service.UserService;
 import com.yuanchu.mom.utils.Jwt;
 import com.yuanchu.mom.utils.QueryWrappers;
-import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.DigestUtils;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Service
-@AllArgsConstructor
 public class UserServiceImp implements UserService {
 
+    @Resource
     UserMapper userMapper;
-
+    @Resource
     Jwt jwt;
-
+    @Resource
     private GetLook getLook;
+
+
 
     @Override
     public User selectUserByPwd(String account, String password) {
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         wrapper.eq("account", account).eq("password", DigestUtils.md5DigestAsHex(password.getBytes())).eq("state", 1);
         List<User> list = userMapper.selectList(wrapper);
-        return list.size()>0?list.get(0):null;
+        return list.size() > 0 ? list.get(0) : null;
     }
 
     //鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛鍚�
@@ -51,18 +55,20 @@
         Map<String, Object> map = new HashMap<>();
         map.put("head", PrintChina.printChina(UserPageDto.class));
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
-        if(map1.get("look")==1) user.setCreateUser(map1.get("userId"));
+        if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
         map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
         return map;
     }
 
     @Override
     public int updateUser(User user) {
+        user.setDepartId("1,"+user.getDepartId());
         return userMapper.updateById(user);
     }
 
     @Override
     public int addUser(User user) {
+        user.setDepartId("1,"+user.getDepartId());
         return userMapper.insert(user);
     }
 
@@ -80,23 +86,30 @@
     @Override
     public User getUserNow() {
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
-        return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId,User::getCompany,User::getName,User::getCode));
+        return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId, User::getCompany, User::getName, User::getCode, User::getPhone));
     }
 
     @Override
     public User getUserInfo() {
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
-        return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).select(User::getId,User::getCompany,User::getName,User::getCode));
+        return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).select(User::getId, User::getCompany, User::getName, User::getCode));
     }
 
     @Override
     public int upUserPassword(String oldPassword, String newPassWord) {
         Map<String, Integer> map = getLook.selectPowerByMethodAndUserId(null);
         User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map.get("userId")).eq(User::getPassword, DigestUtils.md5DigestAsHex(oldPassword.getBytes())).select(User::getId));
-        if(BeanUtil.isEmpty(user)){
+        if (BeanUtil.isEmpty(user)) {
             throw new ErrorException("瀵嗙爜涓嶆纭�");
         }
         user.setPassword(DigestUtils.md5DigestAsHex(newPassWord.getBytes()));
         return userMapper.updateById(user);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int addPersonUser(PersonDto personDto) {
+        System.out.println(personDto);
+        return 1;
+    }
 }

--
Gitblit v1.9.3