Browse Source

Merge branch 'test' into dev

anderx 3 years ago
parent
commit
00fef64620

+ 2 - 2
src/main/java/com/goafanti/ambSystem/service/Impl/AmbServiceImpl.java

@@ -35,7 +35,7 @@ public class AmbServiceImpl extends BaseMybatisDao<AmbSystemMapper> implements A
         in.setCreateBy(TokenManager.getAdminId());
         in.setCreateTime(new Date());
         ambSystemMapper.insertSelective(in);
-        pushAdminAmbRole(in,null);
+        updateAmbRole(in.getLeader());
         return  1;
     }
 
@@ -73,7 +73,7 @@ public class AmbServiceImpl extends BaseMybatisDao<AmbSystemMapper> implements A
     private void pushAdminAmbRole(InputAmb in,AmbSystem use) {
         //如果是修改,处理原负责人
         if (in.getId()!=null){
-            if (in.getLeader()!=null){
+            if (use !=null &&use.getLeader()!=null){
                 updateAmbRole(use.getLeader());
             }
         }

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -900,6 +900,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNew t2= checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
 		t.setOrderDep(t2.getOrderDep());
+		t.setSalesmanId(t2.getSalesmanId());
 		List<String> aids = new ArrayList<>();
 		Integer type=null;
 		TOrderLog tl=new TOrderLog();