From 54f3ccb3496102e16f2acdc74464fd1b538e546d Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Fri, 18 Aug 2023 11:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8A=B6=E6=80=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/docus/server/collection/dto/UserDto.java |  4 ++++
 .../collection/webservice/impl/UserServerImpl.java    | 11 ++++++++---
 .../report/api/impl/TaskDistributeServiceImpl.java    |  5 +++++
 3 files changed, 17 insertions(+), 3 deletions(-)

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<String> cancel(Long taskId) {
         String taskCancelUrl = applicationBusinessConfig.getGetTaskCancelUrl();