品质异常单(采购)调整2

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java

@@ -161,7 +161,7 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
         }
         if (exceptionReport.getStatusId()==1&&("purchase".equals(exceptionReport.getBillType())||"outgoing".equals(exceptionReport.getBillType()))
           //&&!"auditDept".equals(exceptionReport.getHandleNodeId())  //不是审计部审批的
-           &&StringUtils.isBlank(exceptionReport.getDutyDept())   //责任部门是空 最后的审批人就是责任人
+         //  &&StringUtils.isBlank(exceptionReport.getDutyDept())   //责任部门是空 最后的审批人就是责任人
          ){
            // String ds=exceptionReport.getHandleNodeId();
             Map<String, Object>  mapSigns=workflowApplication.queryCounterSignHandlers(exceptionReport.getId(),"Approve");
@@ -169,12 +169,15 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
             List <Map<String,Object>>plist=(List)mapSigns.get("Rows");
            if (Integer.parseInt(mapSigns.get("Total").toString())>0) {
                Map map = plist.get(Integer.parseInt(mapSigns.get("Total").toString()) - 1);
-
-               exceptionReport.setCheckOperator(map.get("handlerId").toString());
-               exceptionReport.setCheckOperatorName(map.get("handlerName").toString());
-               exceptionReport.setDutyDeptName(map.get("deptName").toString());
-               Org org = orgApplication.loadOrg(map.get("handlerId").toString());
-               exceptionReport.setDutyDept(org.getDeptId());
+//             if (StringUtils.isBlank(exceptionReport.getDutyDept())  //没有责任人 或者责任人与审批人不一致
+//                ||!exceptionReport.getDutyDept().equals(map.get("handlerId").toString())
+//             ) {
+                   exceptionReport.setCheckOperator(map.get("handlerId").toString());
+                   exceptionReport.setCheckOperatorName(map.get("handlerName").toString());
+                   exceptionReport.setDutyDeptName(map.get("deptName").toString());
+                   Org org = orgApplication.loadOrg(map.get("handlerId").toString());
+                   exceptionReport.setDutyDept(org.getDeptId());
+             //  }
            }
         }
         exceptionReport = this.saveExceptionReport(exceptionReport);