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

王彪总
2 parents 2b0e1fe7 846cdcdc
Showing 1 changed file with 1 additions and 1 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java
@@ -318,7 +318,7 @@ public class DeptServiceImpl implements DeptService {
         for(AdminUserDO adminUserDO :userList){
             UserDO userDO = new UserDO();
             userDO.setUserId(adminUserDO.getId());
-            userDO.setUsername(adminUserDO.getUsername());
+            userDO.setUsername(adminUserDO.getNickname());
             userDO.setCompanyId(getParentDeptId(adminUserDO.getDeptId()));
             userDO.setDeptId(adminUserDO.getDeptId());
             userDOList.add(userDO);