diff --git a/src/main/java/com/docus/server/collection/dto/UserDto.java b/src/main/java/com/docus/server/collection/dto/UserDto.java index e6b1979..6b0f075 100644 --- a/src/main/java/com/docus/server/collection/dto/UserDto.java +++ b/src/main/java/com/docus/server/collection/dto/UserDto.java @@ -60,6 +60,10 @@ public class UserDto { * 用户手机号码 */ private String telephone; + /** + * 是否删除 + */ + private boolean delFlag; /** * 转换用户修改对象 diff --git a/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java index b93c72b..a2739c5 100644 --- a/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java +++ b/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java @@ -38,8 +38,9 @@ public class UserServerImpl implements IUserServer { receiver = userDto.getReceiver(); String operateType = userDto.getOperateType(); String delType = "D"; - // 判断操作类型 - if (Func.isNotEmpty(operateType) && operateType.contains(delType)) { + // 判断操作类型 是否是删除,或者 删除标记的 + boolean isDel = (Func.isNotEmpty(operateType) && operateType.contains(delType)) || userDto.isDelFlag(); + if (isDel) { iPowerUserService.delUserByUserName(userDto.getUserName()); } else { iPowerUserService.register(userDto); @@ -62,6 +63,7 @@ public class UserServerImpl implements IUserServer { * @return UserDto */ public UserDto strToUserDto(String receiveUser) { + final String notDelFlag = "1"; XmlUtil xmlParseUtil = XmlUtil.of(receiveUser); Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); @@ -73,6 +75,8 @@ public class UserServerImpl implements IUserServer { Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); Node telephoneNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/EMPL_TEL/@value"); + Node delFlagNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/STATUS_CODE/@value"); + boolean isDel = !notDelFlag.equals(delFlagNode.getNodeValue()); UserDto userDto = new UserDto(); userDto.setDeptId(deptCodeNode.getNodeValue()); userDto.setReceiver(receiverNode.getNodeValue()); @@ -84,7 +88,8 @@ public class UserServerImpl implements IUserServer { userDto.setMessageId(msgIdNode.getNodeValue()); userDto.setAuthorName(authorNameNode.getNodeValue()); userDto.setRoleId(0L); - userDto.setTelephone(telephoneNode!=null?telephoneNode.getNodeValue():""); + userDto.setTelephone(telephoneNode != null ? telephoneNode.getNodeValue() : ""); + userDto.setDelFlag(isDel); return userDto; } diff --git a/src/main/java/com/docus/server/report/api/impl/TaskDistributeServiceImpl.java b/src/main/java/com/docus/server/report/api/impl/TaskDistributeServiceImpl.java index 65bac58..1dc7641 100644 --- a/src/main/java/com/docus/server/report/api/impl/TaskDistributeServiceImpl.java +++ b/src/main/java/com/docus/server/report/api/impl/TaskDistributeServiceImpl.java @@ -45,6 +45,11 @@ public class TaskDistributeServiceImpl implements TaskDistributeService { return reportDownTwoDtoCommonResult.getData(); } + public static void main(String[] args) { + String path="111.jpg"; + String fh=".jpg"; + System.out.println(path.endsWith(fh)); + } @Override public CommonResult cancel(Long taskId) { String taskCancelUrl = applicationBusinessConfig.getGetTaskCancelUrl();