Commit d2e0af3d authored by 刘学辉's avatar 刘学辉

销售订单审批增加审批人

parent 11444ab5
...@@ -392,9 +392,11 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier ...@@ -392,9 +392,11 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
if ("S".equals(sapResult.getTYPE())) { if ("S".equals(sapResult.getTYPE())) {
if ("0".equals(suppliersInfo.getApplyType())){ if ("0".equals(suppliersInfo.getApplyType())){
suppliersInfo.setPartner(sapResult.getMESSAGE_V1().substring(4)); suppliersInfo.setPartner(sapResult.getMESSAGE_V1().substring(4));
resultMap.put("MESSAGE", sapResult.getMESSAGE()+sapResult.getMESSAGE_V1().substring(4));
} else {
resultMap.put("MESSAGE", sapResult.getMESSAGE());
} }
resultMap.put("TYPE", sapResult.getTYPE()); resultMap.put("TYPE", sapResult.getTYPE());
resultMap.put("MESSAGE", sapResult.getMESSAGE());
suppliersInfoRepository.save(suppliersInfo); suppliersInfoRepository.save(suppliersInfo);
} else { } else {
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
SELECT o.FULL_ID, o.FULL_NAME SELECT o.FULL_ID, o.FULL_NAME
FROM sa_oporg o WHERE o.PARENT_ID IN ( FROM sa_oporg o WHERE o.PARENT_ID IN (
SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) ) SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) )
AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ','ZR' ); AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ','ZR','DTAB' );
</sql> </sql>
<!--根据业务主表id和业务表名查询对应申请人的二级部门领导--> <!--根据业务主表id和业务表名查询对应申请人的二级部门领导-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment