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

src/main/java/cn/timer/api/controller/disk/DiskFilesController.java

@@ -86,6 +86,7 @@ public class DiskFilesController {
                     .eq("org_id", userBean.getOrgCode())
                     .eq("org_id", userBean.getOrgCode())
                     .eq("parent_id",0)
                     .eq("parent_id",0)
                     .eq("delete_flag",0)
                     .eq("delete_flag",0)
+                    .eq("type",JxglEnumInterface.DiskCatalogueType.DISK_FILE.getType())
                     .eq("create_user_id",userBean.getEmpNum()).orderByDesc("create_time")
                     .eq("create_user_id",userBean.getEmpNum()).orderByDesc("create_time")
             );
             );
             if(StringUtils.isEmpty(diskCatalogue)){
             if(StringUtils.isEmpty(diskCatalogue)){

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -1257,8 +1257,15 @@ public class SpmkController {
                         if (!listFlowChildren.get(currentIndex).getExecute().equals("1") && !listFlowChildren.get(currentIndex).getExecute().equals("0")) {
                         if (!listFlowChildren.get(currentIndex).getExecute().equals("1") && !listFlowChildren.get(currentIndex).getExecute().equals("0")) {
                             //如果当前索引下的都要变更为0未执行
                             //如果当前索引下的都要变更为0未执行
                             FlowChildren flowChildren = listFlowChildren.get(spmkApproveDetailDto.getIndex());
                             FlowChildren flowChildren = listFlowChildren.get(spmkApproveDetailDto.getIndex());
+                            SpmkApproveExecuteRecord spmkApproveExecuteRecord=null;
+                            //如果有执行记录
+                            if(spmkApproveDetailDto.getApproveExecuteRecordId()>0){
+                                spmkApproveExecuteRecord=spmkApproveExecuteRecordMapper.selectById(spmkApproveDetailDto.getApproveExecuteRecordId());
+                            }else{
                                 User user = flowChildren.getRelation().get(0).getUsers().get(spmkApproveDetailDto.getUserIndex());
                                 User user = flowChildren.getRelation().get(0).getUsers().get(spmkApproveDetailDto.getUserIndex());
-                            SpmkApproveExecuteRecord spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(user.getId()), spmkApproveDetailSummary.getApproveSummaryId());
+                                spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(user.getId()), spmkApproveDetailSummary.getApproveSummaryId());
+                            }
+
                             //删除审批过的人记录
                             //删除审批过的人记录
                             if (spmkApproveExecuteRecord != null) {
                             if (spmkApproveExecuteRecord != null) {
                                 spmkApproveExecuteRecordMapper.delExecuteRecord(spmkApproveExecuteRecord.getId(), spmkApproveDetailSummary.getApproveSummaryId());
                                 spmkApproveExecuteRecordMapper.delExecuteRecord(spmkApproveExecuteRecord.getId(), spmkApproveDetailSummary.getApproveSummaryId());
@@ -1305,6 +1312,7 @@ public class SpmkController {
             SpmkApproveDetailSummary.builder().id(spmkApproveDetailDto.getId())
             SpmkApproveDetailSummary.builder().id(spmkApproveDetailDto.getId())
                     .flowChildren(JSONArray.fromObject(listFlowChildren).toString()).build().updateById();
                     .flowChildren(JSONArray.fromObject(listFlowChildren).toString()).build().updateById();
         } catch (Exception e) {
         } catch (Exception e) {
+            e.printStackTrace();
             return ResultUtil.error(e);
             return ResultUtil.error(e);
         }
         }