Merge pull request 'fix: 修改任务多级审批' (#119) from fix/UpdateFlowComplete20240416 into test

Reviewed-on: #119

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java

@@ -5,6 +5,7 @@ import cn.jyjz.xiaoyao.common.base.vo.User;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,6 +24,8 @@ public interface UserTokenService {
      */
     User findByLoginname(String loginname);
 
+    List<User> findByLoginNameList(String[] loginname);
+
     /**
      * 查询用户对象
      * @param phone 登录手机号

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java

@@ -26,10 +26,8 @@ import cn.jyjz.xiaoyao.common.base.exception.MyTokenExpiredException;
 import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel;
 import cn.jyjz.xiaoyao.framework.security.service.FlowableUserLoginService;
 import cn.jyjz.xiaoyao.framework.security.utils.JwtUtils;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -102,6 +100,16 @@ public class UserTokenServiceImpl implements UserTokenService {
         return user;
     }
 
+    @Override
+    public List<User> findByLoginNameList(String[] loginname) {
+        List<User> userList = new ArrayList<>();
+        for (String userName : loginname) {
+            User user = this.findByLoginname(userName);
+            userList.add(user);
+        }
+        return userList;
+    }
+
     public User findByPhone(String phone) {
 
         cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findByPhone(phone);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -558,11 +558,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
     //发送消息
     public void sendMsg(OcrTaskchildPicture model, UserToken userToken) {
-        cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee());
+        String[] split = model.getAssignee().split(",");
+        List<cn.jyjz.xiaoyao.common.base.vo.User> userList = userTokenService.findByLoginNameList(split);
+        for (cn.jyjz.xiaoyao.common.base.vo.User user : userList) {
             OcrMsg msg = new OcrMsg();
             msg.setCreateTime(System.currentTimeMillis());
             msg.setSendTime(System.currentTimeMillis());
-        msg.setReceiveUserIds(byLoginname.getId().toString());
+            msg.setReceiveUserIds(user.getId().toString());
             msg.setTitile(model.getFromtaskname());
             msg.setSender(Long.valueOf(userToken.getUserid()));
             JSONObject jsonObject = new JSONObject();
@@ -584,6 +586,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             ocrMsgService.save(msg);
         }
 
+    }
+
     /**
      * 更新当前节点处理人信息
      *

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java

@@ -127,7 +127,7 @@ public class ApiTestController {
         PictureSourceParameter pictureSourceParameter = new PictureSourceParameter();
         pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
         pictureSourceParameter.setTenantNo(1714548920583360512L);
-        pictureSourceParameter.setAccountNo(1714887674875514880L);
+        pictureSourceParameter.setAccountNo(1714559323824623616L);
 
         List<String> notAddedToQueueTaskIds = new ArrayList<>();
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

@@ -239,7 +239,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         //目前没有做其他信息返回，如果需要再做修改
         for (OcrTaskchildPicture ocrTaskchildPicture : list) {
             //判断审批人是否为当前登录用户
-            if (userToken.getLoginname().equals(ocrTaskchildPicture.getAssignee()) &&
+            if (ocrTaskchildPicture.getAssignee().contains(userToken.getLoginname()) &&
                     (ocrTaskchildPicture.getStates().intValue() != SystemConstantsOa.OA_STATUS_TYPE_END
                             && ocrTaskchildPicture.getStates().intValue() != SystemConstantsOa.OA_STATUS_TYPE_REFUSE)) {
                 formIds.add(ocrTaskchildPicture.getId().toString());

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -635,7 +635,7 @@
         from ocr_taskchild_picture tc
                  LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
                  left join ocr_picture op on tc.PICTUREID = op.ID
-        where tc.ASSIGNEE = #{searchassignee}
+        where FIND_IN_SET(#{searchassignee}, tc.ASSIGNEE)
           and tc.TENANTID = #{searchtenantid}
           and tc.STATES = 2
           and op.suspiciousfile = 0
@@ -686,7 +686,7 @@
         from ocr_taskchild_picture tc
         LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
         left join ocr_picture op on tc.PICTUREID = op.ID
-        where tc.ASSIGNEE = #{searchassignee}
+        where FIND_IN_SET(#{searchassignee}, tc.ASSIGNEE)
         and tc.TENANTID = #{searchtenantid}
         and tc.STATES = 2
         and op.suspiciousfile = 0