Merge remote-tracking branch 'origin/master'

module-staff/src/main/java/cn/com/tenlion/staff/service/basicstaffinfo/impl/BasicStaffInfoServiceImpl.java

@@ -53,7 +53,7 @@ public class BasicStaffInfoServiceImpl extends DefaultBaseService implements IBa
             query.put("bindUserAccount",params.get("creator").toString());
             BasicStaffInfoDTO dto = basicStaffInfoDao.getById(query);
             // 如果不为空删除后重新保存
-            if(dto != null){
+            if(dto != null && dto.getBasicStaffInfoId() != null){
                 List<String> ids = new ArrayList<>();
                 ids.add(dto.getBasicStaffInfoId());
                 query.put("ids",ids);