BJ_FS / urbanops

Commit 2b0e1fe79f2b693271193697d42f1e475e6ceb6b

Authored by 王彪总
2 parents c57cf10d f864e599

Merge remote-tracking branch 'origin/master' into dev

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java
  View file @2b0e1fe
@@ -61,8 +61,8 @@ public class DeviceUserServiceImpl implements DeviceUserService { @@ -61,8 +61,8 @@ public class DeviceUserServiceImpl implements DeviceUserService {
61 deviceUser.setProductName(deviceInfo.getProductName()); 61 deviceUser.setProductName(deviceInfo.getProductName());
62 deviceUser.setCompanyId(createReqVO.getCompanyId()); 62 deviceUser.setCompanyId(createReqVO.getCompanyId());
63 deviceUser.setDeptId(createReqVO.getDeptId()); 63 deviceUser.setDeptId(createReqVO.getDeptId());
64 - deviceUser.setUserId(Long.parseLong(userId));  
65 - deviceUser.setUserName(userName); 64 + deviceUser.setUserId(createReqVO.getUserId());
  65 + deviceUser.setUserName(createReqVO.getUserName());
66 deviceUser.setCreateTime(now); 66 deviceUser.setCreateTime(now);
67 deviceUser.setCreator(userId); 67 deviceUser.setCreator(userId);
68 deviceUser.setCreatorName(userName); 68 deviceUser.setCreatorName(userName);