岗位

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -328,7 +328,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                 userOrderAuthorDiyList.addAll(diyrole);
             }
         }
-
+/*
         //division
         //BMD-NVB2023T05
         List<SysUserOrderAuthor> userOrderAuthorBMDList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T05");
@@ -376,10 +376,10 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             }
         }
         //cw
-       /* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
+       *//* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
         List<Long> cwauthList=userOrderAuthorCwList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> cwrole=sysUserOrderAuthorMapper.selectByParentId(cwauthList);
-        userOrderAuthorCwList.addAll(cwrole);*/
+        userOrderAuthorCwList.addAll(cwrole);*//*
        //ysl
         List<SysUserOrderAuthor> userOrderAuthorYSLList = sysUserOrderAuthorMapper.selectAuthorIdByCode("YSL",null);
         if(userOrderAuthorYSLList !=null && userOrderAuthorYSLList.size()>0){
@@ -388,7 +388,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             if(yslrole !=null && yslrole.size()>0){
                 userOrderAuthorYSLList.addAll(yslrole);
             }
-        }
+        }*/
         //xls
         List<SysUserOrderAuthor> userOrderAuthorXlsList = sysUserOrderAuthorMapper.selectAuthorIdByCode("XLS",null);
         if(userOrderAuthorXlsList !=null && userOrderAuthorXlsList.size()>0){
@@ -407,7 +407,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
           /*  if (intNumber.equals("cw")) {
                 userOrderAuthorList.clear();
                 userOrderAuthorList.addAll(userOrderAuthorCwList);
-            } else*/ if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
+            } else*/ /*if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
                     || intNumber.equals("saledept") || intNumber.equals("suboffice")) {
                 userOrderAuthorList.clear();
                 roleAuth.clear();
@@ -431,7 +431,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                         userOrderAuthorList.addAll(userOrderAuthor36List);
                     }
 
-                }else if(intNumber.equals("customer")){
+                }else */if(intNumber.equals("customer")){
                     String isCustomerManager=sysUserExt.getIsCustomerManager();
                     if(isCustomerManager !=null && !("").equals(isCustomerManager)){
                         List<String> isManager =Arrays.asList(isCustomerManager.split(","));

suishenbang-system/src/main/resources/mapper/system/SysUserSalesExtMapper.xml

@@ -206,7 +206,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             e.sales_level as salesLevel,
             e.org_code as orgCode,
-            e.user_id as userId
+            e.user_id as userId,
+            e.is_customer_manager as isCustomerManager
         FROM
             sys_user_ext e LEFT JOIN sys_user u on  u.user_id = e.user_id
         WHERE

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/EsignSignServiceImpl.java

@@ -258,19 +258,20 @@ public class EsignSignServiceImpl implements IEsignSignService {
         /*下载保存签署后的文件，返回文件存储地址*/
         OrderFile orderFile = new OrderFile();
         orderFile.setFlowId(flowId);
-        if(orderFlag.getTypes()==1){
-            downloadFile(Global.getPdfPath(), orderFlag.getOrderId()+uId + ".pdf", fileUrl);
-            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getOrderId()+uId + ".pdf");
-            tmsCertificate(orderFlag.getDeliveryNumber(),Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getOrderId()+uId + ".pdf");
-        }else if( orderFlag.getTypes()==2){
+        if(orderFlag.getTypes().equals(1)){
+            downloadFile(Global.getPdfPath(), orderFlag.getFlowId()+uId + ".pdf", fileUrl);
+            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + ".pdf");
+            tmsCertificate(orderFlag.getDeliveryNumber(),Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + ".pdf");
+        }else if( orderFlag.getTypes().equals(2)){
+            downloadFile(Global.getPdfPath(), orderFlag.getFlowId()+uId + "_签收订单.pdf", fileUrl);
+            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + "_签收订单.pdf");
+        }else{
             downloadFile(Global.getPdfPath(), orderFlag.getFlowId()+uId + "_授权委托.pdf", fileUrl);
             orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getFlowId()+uId + "_授权委托.pdf");
-        }else{
-            downloadFile(Global.getPdfPath(), orderFlag.getOrderId()+uId + "_签收订单.pdf", fileUrl);
-            orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/pdf/"+DateUtils.datePath()+"/"+orderFlag.getOrderId()+uId + "_签收订单.pdf");
 
         }
 //        orderFile.setFileUrl(refile);
+        log.info("E签宝 = [{}], 流程id = [{}]",orderFile.getFileUrl(),orderFile.getFlowId());
         orderFileService.updateOrderFileByFlowId(orderFile);
     }
     /**