|
@@ -284,7 +284,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
//新增或修改用户
|
|
|
@Override
|
|
|
public HttpRespMsg insertUser(String targetId, String name, String phone, Integer role, Double cost,
|
|
|
- HttpServletRequest request) {
|
|
|
+ Integer departmentId, HttpServletRequest request) {
|
|
|
HttpRespMsg httpRespMsg = new HttpRespMsg();
|
|
|
try {
|
|
|
User creator = userMapper.selectById(request.getHeader("Token"));
|
|
@@ -314,7 +314,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
.setPhone(phone)
|
|
|
.setRole(role)
|
|
|
.setCompanyId(creator.getCompanyId())
|
|
|
- .setCost(costValue);
|
|
|
+ .setCost(costValue)
|
|
|
+ .setDepartmentId(departmentId == null ? 0 : departmentId);
|
|
|
if (userMapper.insert(user) == 0) {
|
|
|
httpRespMsg.setError("操作失败");
|
|
|
}
|
|
@@ -327,7 +328,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
.setName(name)
|
|
|
.setPhone(phone)
|
|
|
.setRole(role)
|
|
|
- .setCost(costValue));
|
|
|
+ .setCost(costValue)
|
|
|
+ .setDepartmentId(departmentId == null ? 0 : departmentId));
|
|
|
}
|
|
|
} catch (NullPointerException e) {
|
|
|
httpRespMsg.setError("数据有误 验证失败");
|