瀏覽代碼

Merge branch 'test' of jishutao/kede-server into prod

anderx 3 年之前
父節點
當前提交
8fafb54d62
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/main/java/com/goafanti/ambSystem/service/Impl/AmbServiceImpl.java

+ 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 (use.getLeader()!=null){
+            if (use !=null &&use.getLeader()!=null){
                 updateAmbRole(use.getLeader());
             }
         }