yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
3120626891@qq.com 2022-07-17 10:12:19 +08:00
commit 76cbc973f0
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

17
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -10992,9 +10992,17 @@ public String deleteReply(String replyid, String messageid) {
if (_uc.getUID().equals(memberModel.getUserId())) continue; if (_uc.getUID().equals(memberModel.getUserId())) continue;
JSONObject user = new JSONObject(); JSONObject user = new JSONObject();
UserModel userModel = SDK.getORGAPI().getUser(memberModel.getUserId()); UserModel userModel = SDK.getORGAPI().getUser(memberModel.getUserId());
if (userModel == null) {
System.out.println("当前人员【"+memberModel.getUserId()+"】在组织架构中未找到");
continue;
}
user.put("userId",userModel.getUID()); user.put("userId",userModel.getUID());
user.put("userName",userModel.getUserNameI18N()); user.put("userName",userModel.getUserNameI18N());
DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(memberModel.getUserId()); DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(memberModel.getUserId());
if (department == null) {
System.out.println("当前人员【"+memberModel.getUserId()+"】的部门信息在组织架构中未找到");
continue;
}
user.put("deptId",department.getId()); user.put("deptId",department.getId());
user.put("deptName",department.getNameI18N()); user.put("deptName",department.getNameI18N());
createUsers.add(user); createUsers.add(user);
@ -11012,9 +11020,17 @@ public String deleteReply(String replyid, String messageid) {
for (String userId : userIds) { for (String userId : userIds) {
JSONObject user = new JSONObject(); JSONObject user = new JSONObject();
UserModel userModel = SDK.getORGAPI().getUser(userId); UserModel userModel = SDK.getORGAPI().getUser(userId);
if (userModel == null) {
System.out.println("当前人员【"+userId+"】在组织架构中未找到");
continue;
}
user.put("userId",userModel.getUID()); user.put("userId",userModel.getUID());
user.put("userName",userModel.getUserNameI18N()); user.put("userName",userModel.getUserNameI18N());
DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(userId); DepartmentModel department = SDK.getORGAPI().getDepartmentByUser(userId);
if (department == null) {
System.out.println("当前人员【"+userId+"】的部门信息在组织架构中未找到");
continue;
}
user.put("deptId",department.getId()); user.put("deptId",department.getId());
user.put("deptName",department.getNameI18N()); user.put("deptName",department.getNameI18N());
createUsers.add(user); createUsers.add(user);
@ -11022,7 +11038,6 @@ public String deleteReply(String replyid, String messageid) {
} }
JSONObject currentUser = new JSONObject(); JSONObject currentUser = new JSONObject();
UserModel userModel = _uc.getUserModel(); UserModel userModel = _uc.getUserModel();
System.out.println("currentUserId: " + _uc.getUID()+" currentUserModel:"+userModel);
currentUser.put("userId",userModel.getUID()); currentUser.put("userId",userModel.getUID());
currentUser.put("userName",userModel.getUserNameI18N()); currentUser.put("userName",userModel.getUserNameI18N());
DepartmentModel department = _uc.getDepartmentModel(); DepartmentModel department = _uc.getDepartmentModel();