1

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java

@@ -102,13 +102,12 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         if (req.getBussinessType().equals("remove")){
             Boolean aBoolean = addOrRevokeAgentBrokenNum(req,true);
         }
-        BusForm busForm1 = new BusForm();
+        BusForm busForm1=null;
         if (ObjectUtil.isNotNull(req.getId()) && !req.getId().trim().isEmpty()){
 
-            busForm1=  this.getById(req.getId());
+            busForm1 = this.getById(req.getId());
         }
-        if (ObjectUtil.isNull(busForm1))
-        {
+        if (busForm1==null) {
             //判断是否有工作流id，如果有则将状态进行修改
             if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
             {
@@ -119,8 +118,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                 req.setExamineState("working");
             }
         }
-        else
-        {
+        else {
             //判断该单据是否可以进行修改(如果审核中则不允许修改)\
             if (ObjectUtil.isNotNull(busForm1.getExamineState()) && busForm1.getExamineState().equals("working")){
                 throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -125,9 +125,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public List<String> AddOrder(UpdateOrderReq req) {
         //修改单据使用次数状态，判断数据库是否有该单据，如果有，那么就判断当前单号是否一致，如果不一致，修改单据使用次数
         Long orgId;
+        OrderMain one=null;
         if (ObjectUtil.isNotNull(req.getId())){
-            OrderMain one = orderMainExist(req.getId());
-            if (ObjectUtil.isNotNull(one.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())) {
+            one = orderMainExist(req.getId());
+            if (ObjectUtil.isNotNull(req.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())) {
                 if (!one.getBussinessCode().equals(req.getBussinessCode())) {
                     if (req.getOrderType().equals("in")) {
                         orgId = req.getEndOrgId();
@@ -146,7 +147,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 }
             }
             //入参不为空，库里为空
-            else if (ObjectUtil.isNotNull(one.getBussinessCode()) && ObjectUtil.isNull(one.getBussinessCode())){
+            else if (ObjectUtil.isNotNull(req.getBussinessCode()) && ObjectUtil.isNull(one.getBussinessCode())){
                 //只需要改一条数据
                 if (req.getOrderType().equals("in")){
                     orgId=req.getEndOrgId();
@@ -160,7 +161,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 busFormService.updateById(one1);
             }
             //入参为空，库里不为空
-            else if (ObjectUtil.isNull(one.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())){
+            else if (ObjectUtil.isNull(req.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())){
                 //只需要改一条数据
                 if (req.getOrderType().equals("in")){
                     orgId=req.getEndOrgId();
@@ -188,17 +189,20 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             }
         }
 
-
+        if (one==null){
             //判断是否有工作流id，如果有则将状态进行修改
             if (ObjectUtil.isEmpty(req.getProcessDefinitionId())) {
                 req.setExamineState("none");
             } else {
                 req.setExamineState("working");
             }
+        }else {
             //判断该单据是否可以进行修改(如果审核中则不允许修改)
-        if (ObjectUtil.isNotNull(req.getProcessId()) && !req.getProcessId().trim().isEmpty()){
+            if (ObjectUtil.isNotNull(one.getExamineState()) && !one.getExamineState().trim().isEmpty()){
                 throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
             }
+        }
+
         OrderMain order = new OrderMain();
         BeanPlusUtil.copyProperties(req, order);
         //先判断该单据id是否存在，如果存在，进行更新操作即可