Merge remote-tracking branch 'origin/apps_dev' into apps_dev

This commit is contained in:
3120626891@qq.com 2022-07-16 18:13:59 +08:00
commit 11746f7740
2 changed files with 3 additions and 2 deletions

View File

@ -11021,10 +11021,11 @@ public String deleteReply(String replyid, String messageid) {
}
}
JSONObject currentUser = new JSONObject();
UserModel userModel = SDK.getORGAPI().getUser(_uc.getUID());
UserModel userModel = _uc.getUserModel();
System.out.println("currentUserId: " + _uc.getUID()+" currentUserModel:"+userModel);
currentUser.put("userId",userModel.getUID());
currentUser.put("userName",userModel.getUserNameI18N());
DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(_uc.getUID());
DepartmentModel department = _uc.getDepartmentModel();
currentUser.put("deptId",department.getId());
currentUser.put("deptName",department.getNameI18N());
ro.put("createUsers",createUsers);